OSDN Git Service

Reconcile with gingerbread-mr4-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 27 Jul 2011 17:42:40 +0000 (10:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 27 Jul 2011 17:42:40 +0000 (10:42 -0700)
Change-Id: Ib13d4ae0889290a35357da01bf3acf140b89bd23


Trivial merge