OSDN Git Service

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


Trivial merge