OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:52 +0000 (08:56 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:52 +0000 (08:56 -0800)
Change-Id: I4907309d47ab642baf4a2ca0c65b563400f52ee9


Trivial merge