OSDN Git Service

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


Trivial merge