OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:36 +0000 (10:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:36 +0000 (10:11 -0800)
commit2ab3572ba3431e45b7dbedaa4573b00fa80826b2
treec3b20b5621397dc7378b6384c0f8bc42284f77f8
parent134c0348f9643eff06e1d69f7a144a1870aa29e4
parent067153c05966b1e6e9e78f76f2b8356a3c3b8876
Reconcile with ics-mr1-release

Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9