OSDN Git Service

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


Trivial merge