tree b2b09ec4c091e845c0e0f2546ba673b9d425331a
parent e98b8682c27dabe52f000c4c8105a3eb817df3b5
parent 295547788de320294ae8ca26c08699aea1909a14
author Andrew Flynn <flynn@google.com> 1337634710 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337634710 -0700

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

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