OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 22:59:38 +0000 (15:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 22:59:38 +0000 (15:59 -0700)
Change-Id: I8e45b4aba1157aec4a3d12cf9cd2b77610b677e9


Trivial merge