OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Nov 2011 22:53:50 +0000 (14:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Nov 2011 22:53:51 +0000 (14:53 -0800)
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e


Trivial merge