OSDN Git Service

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


Trivial merge