OSDN Git Service

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


Trivial merge