OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:32:47 +0000 (16:32 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:32:48 +0000 (16:32 -0800)
commitf1b829d19d71df2228a7af2a253877edeaa0f2f0
treec3b20b5621397dc7378b6384c0f8bc42284f77f8
parent2ab3572ba3431e45b7dbedaa4573b00fa80826b2
parent081c50ffc5697cef02de897c2bba80585103415e
Reconcile with ics-mr1-release

Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e