OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:07:12 +0000 (13:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:07:12 +0000 (13:07 -0800)
Change-Id: Id6ecd416cb70e55c28ff885caae29d9000dc9133


Trivial merge