tree 560b5dcb1a3b1dc694a176dd7fca8e7c63f77414
parent 1999478105beb0a502fe5398d19c9a82a088a23b
parent c288fb7ef3a7a535888281eb0d34e08e476ed99d
author Jean-Baptiste Queru <jbq@google.com> 1291999777 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291999777 -0800

am a218e014: reconcile with open-source gingerbread

* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':