OSDN Git Service

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


Trivial merge