OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:23 +0000 (10:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:23 +0000 (10:22 -0800)
Change-Id: I04db6f7d07f213a6dabec96efd393041f109e174


Trivial merge