OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 21:57:33 +0000 (13:57 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 21:57:33 +0000 (13:57 -0800)
Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497


Trivial merge