OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7


Trivial merge