OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Jan 2012 18:16:07 +0000 (10:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Jan 2012 18:16:07 +0000 (10:16 -0800)
Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059


Trivial merge