tree 0b8accc2d5b58e5121e60ec38a0a2b829f266455
parent d5064c6252d440841e5bb408ed1b6bbad830d85b
parent 09a49faead475dc54b460f7a22da5ae7b4773092
author Jean-Baptiste Queru <jbq@google.com> 1296768881 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296768881 -0800

am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread

* commit '236afa6806c384a235782cde820a7f01de9e1b82':