OSDN Git Service

Reconcile with gingerbread-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 18 Jul 2011 15:10:06 +0000 (08:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 18 Jul 2011 15:10:06 +0000 (08:10 -0700)
Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b


Trivial merge