OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:29 +0000 (13:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:29 +0000 (13:19 -0700)
Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e


Trivial merge