tree b2b09ec4c091e845c0e0f2546ba673b9d425331a
parent 5641366699b8ab253373be0f9005bac3418be7fe
parent cee461daa1bfc6ea13f2be44b1dd4d8055cba749
author Andrew Flynn <flynn@google.com> 1337381965 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337381965 -0700

am cee461da: Merge "Add 1x1 transparent dummy img so we can reference bg_cling5" into jb-dev

* commit 'cee461daa1bfc6ea13f2be44b1dd4d8055cba749':
  Add 1x1 transparent dummy img so we can reference bg_cling5