OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2


Trivial merge