tree 1aa5d96d4f2da0806dd673b50fe6ec65ec0036d6
parent 332b351258dff9c416ec04a979816dd3c50c4b8f
parent a26868d6afffff8be91653da36cb4152ed68759a
author Mike Cleron <mcleron@google.com> 1257273519 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257273519 -0800

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

Merge commit 'a26868d6afffff8be91653da36cb4152ed68759a'

* commit 'a26868d6afffff8be91653da36cb4152ed68759a':
  Fix 2209039 and 2220106