OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:05:46 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:05:46 +0000 (14:05 -0800)
Change-Id: Idc7bbf210376184867a6265475e34967c00b1315


Trivial merge