OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Oct 2011 16:17:01 +0000 (09:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Oct 2011 16:17:01 +0000 (09:17 -0700)
Change-Id: Id2ef87f3662a93f2cedbf1dcb7f0f33d9893637e


Trivial merge