OSDN Git Service

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


Trivial merge