tree 732be2e45a6af945461eb66ad9b6cccaa3e53a8d
parent 1d2c25b7804e6fcee213b5ed81594f48c563e2eb
parent a07d37b79300e76da5f21f532578fcd686a74b16
author Ying Wang <wangying@google.com> 1276272283 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276272283 -0700

am a07d37b7: Cherry-pick bug fixes from master.

Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread

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