OSDN Git Service

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


Trivial merge