tree 81b14fb82ce8e951b01534e65e8b4bd4bdf6cb94
parent aab86939c15fac901d1898b5484d4d1ca08c4e56
parent 313fb1f3bbc9f41cf3cac88a59da8e534d8484f8
author Justin Ho <justinho@google.com> 1286735141 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286735141 -0700

am 51501aa8: (-s ours) am b74941e3: Merge "Fixed popup assets (background)" into gingerbread

Merge commit '51501aa8703c15c6156ba14774f3ff41cde31700'

* commit '51501aa8703c15c6156ba14774f3ff41cde31700':
  Fixed popup assets (background)