OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:41:32 +0000 (16:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:41:32 +0000 (16:41 -0800)
Change-Id: I2484dad4a2ab183880aeede3685b6e0bae83ab82


Trivial merge