OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)
Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19


Trivial merge