OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78


Trivial merge