tree 59a73c9e1fa68e3798fb43e7f660320b76a98333
parent ab251d9c80bdffb53605437c9c18c2d0ee40aa24
parent a07d37b79300e76da5f21f532578fcd686a74b16
author Ying Wang <wangying@google.com> 1276272305 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276272305 -0700

am a07d37b7: Cherry-pick bug fixes from master.

Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into froyo-plus-aosp

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
  Cherry-pick bug fixes from master.