OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:18:32 +0000 (10:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:18:32 +0000 (10:18 -0800)
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958


Trivial merge