OSDN Git Service

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


Trivial merge