OSDN Git Service

Reconcile with gingerbread-release gingerbread-mr4-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Aug 2011 01:46:20 +0000 (18:46 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Aug 2011 01:46:20 +0000 (18:46 -0700)
Change-Id: I2e05e29384ce13de26514fd1e120c00cd0e39112


Trivial merge