OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:36 +0000 (10:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:36 +0000 (10:11 -0800)
Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9


Trivial merge