OSDN Git Service

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


Trivial merge