tree 60a86919e626e09690310f1a42282c82c53f52ac
parent e2dcd7f0fe6a892cb3e7a606b35e1df84ed4d8d6
parent dfcc7b62f5a34a06c8d6b2c5a6f23135e190a4a5
author Dianne Hackborn <hackbod@google.com> 1322715057 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322715057 -0800

am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1

* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
  Fix issue #5433192 and maybe #5433192