OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:02 +0000 (10:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:02 +0000 (10:22 -0800)
Change-Id: I409eea7f746a37d96ba1af9b60488d93e7e39d96


Trivial merge