OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 03:57:24 +0000 (19:57 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 03:57:24 +0000 (19:57 -0800)
Change-Id: I13575fbc40df854f574e7eaf8cfee6153ab3a342


Trivial merge