tree 1aa5d96d4f2da0806dd673b50fe6ec65ec0036d6
parent 487125107c151b7ec1de2dd559cda5fee1fa598a
parent 4a5c1e1ec9e8bad2cd9a29f3db68a106d4928be3
author Mike Cleron <mcleron@google.com> 1257272884 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257272884 -0800

am 4a5c1e1e: Fix 2209039 and 2220106

Merge commit '4a5c1e1ec9e8bad2cd9a29f3db68a106d4928be3' into eclair-mr2

* commit '4a5c1e1ec9e8bad2cd9a29f3db68a106d4928be3':
  Fix 2209039 and 2220106