OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 16:00:34 +0000 (09:00 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 16:00:34 +0000 (09:00 -0700)
Change-Id: If78df17136dfe425e6752b315590b47d4c135d21


Trivial merge