OSDN Git Service

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


Trivial merge