am a218e014: reconcile with open-source gingerbread
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
This commit is contained in:
committed by
Android Git Automerger
commit
81266d9936