am 2a7c5425
: reconcile with open-source gingerbread
* commit '2a7c542594e37f61e25fec7f441eb0a8dc14fd62':
This commit is contained in:
committed by
Android Git Automerger
commit
9b9c61f615