am c0b1c0ac: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit 'c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5'

* commit 'c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5':