OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Feb 2012 16:09:26 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Feb 2012 16:09:26 +0000 (08:09 -0800)
Change-Id: I4b9445667934514a9c04ed8df17f422d7c3755aa


Trivial merge