OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Oct 2011 00:16:15 +0000 (17:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Oct 2011 00:16:15 +0000 (17:16 -0700)
Change-Id: I82d822c97b43372244bb0f676120489f755939a3


Trivial merge