tree 25efec5d69b81b6fbf2046677d6f445ec6e354f7
parent 071222d913b2e5645f058b1e278de70de977c09c
parent d213f5c9ce56a74acb6efe880c943d3f96a6af95
author Bart Sears <bsears@google.com> 1323749248 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323749248 -0800

am d213f5c9: Merge "Revert "Fix assets and layout for popup window"" into ics-mr1

* commit 'd213f5c9ce56a74acb6efe880c943d3f96a6af95':
  Revert "Fix assets and layout for popup window"