OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:10:41 +0000 (07:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:10:41 +0000 (07:10 -0800)
Change-Id: I7267a0f90aad28d4698b6c7ebd0e69e9dcd6ade6


Trivial merge