OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 21:57:33 +0000 (13:57 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 21:57:33 +0000 (13:57 -0800)
commit134c0348f9643eff06e1d69f7a144a1870aa29e4
treec3b20b5621397dc7378b6384c0f8bc42284f77f8
parent9950526875f3b71c764a6d39623842e3c26416db
parentea6f0e027d252290e172f388c03b425165727e68
Reconcile with ics-mr1-release

Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497