tree ad542faabd63a7068ebddf095b462c18905b35c1
parent 44094b57794518e1a7db18b497fd2ec223ba2be9
parent 18b36f0dbaaf7164a9a77dc5a5431d324e36c879
author Mike Cleron <mcleron@google.com> 1257812799 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257812799 -0800

am 18b36f0d: am b6f23a6c: am bbe41b55: Merge change I4bd71b0f into eclair

Merge commit '18b36f0dbaaf7164a9a77dc5a5431d324e36c879'

* commit '18b36f0dbaaf7164a9a77dc5a5431d324e36c879':
  Fix http://b/issue?id=2203681