OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:15 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:16 +0000 (10:02 -0800)
Change-Id: I57beb3d2c4e7ee06eb1a14475bf05ce655cb26f3


Trivial merge