OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:26:36 +0000 (13:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:26:36 +0000 (13:26 -0800)
Change-Id: I75bc4cd928873b79be9bf0d8561f765f61e6fbde


Trivial merge