tree 54e89b22ffbab3f1f39e53ce3bec7b8a5b7c090f
parent 35d857002dcbc24d05a0f9d157ce8ee1927ae235
parent fc36afcba6e65f2e0816b1af08255b9ccafb17a6
author Mathias Agopian <mathias@google.com> 1258413163 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258413163 -0800

am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair

Merge commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6' into eclair-mr2-plus-aosp

* commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6':
  fix [2262591] Junk on screen in ERD46