OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:11:09 +0000 (07:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:11:10 +0000 (07:11 -0800)
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7


Trivial merge