OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:25 +0000 (13:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:25 +0000 (13:06 -0800)
commitc9054b11fa3895fe70b2eaba849c6388df449c1e
treedd72617f6d29970534758b8924b99348985a0997
parentda3631dbd120219b883973bb22b64ebd3ef33078
parent0ce12ef01d57bb6c2a32386dccb50a563caa3557
Reconcile with ics-mr1-release

Change-Id: I06332ff4f1ca17df8303819c8ea85cf5f63712ca