OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Thu, 12 Jan 2012 00:28:36 +0000 (16:28 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 12 Jan 2012 00:28:36 +0000 (16:28 -0800)

Trivial merge