OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)
Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb


Trivial merge