tree 9a9ee3a1cf2d14ebd4d5b6ce08f9052e0dc57295
parent ecc1f6eca2a89b5a1d0e0e067e3f270424121546
parent f31f365a7708c931e955670bc6213fdc8f91a87a
author Eric Laurent <elaurent@google.com> 1261554376 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261554376 -0800

am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair

Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'

* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
  Fix issues 2333450 and 2333559: