OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Oct 2011 14:30:03 +0000 (07:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Oct 2011 14:30:03 +0000 (07:30 -0700)
Change-Id: Ibce8b7257faf1e0fbd89e9132b3eede5bfd07405


Trivial merge