OSDN Git Service

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


Trivial merge