OSDN Git Service

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

Trivial merge