tree 1aa5d96d4f2da0806dd673b50fe6ec65ec0036d6
parent e5546a82ef687a73d66bc39ae25f9d0685a59a87
parent 8907fc2aa2478ada561fc5cdd0a885633c303289
author Mike Cleron <mcleron@google.com> 1257273139 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257273139 -0800

am 8907fc2a: am 4a5c1e1e: Fix 2209039 and 2220106

Merge commit '8907fc2aa2478ada561fc5cdd0a885633c303289' into eclair-mr2-plus-aosp

* commit '8907fc2aa2478ada561fc5cdd0a885633c303289':
  Fix 2209039 and 2220106