OSDN Git Service

Reconcile with gingerbread-mr4-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jul 2011 14:24:01 +0000 (07:24 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jul 2011 14:24:01 +0000 (07:24 -0700)
Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a


Trivial merge