OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad


Trivial merge