OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Wed, 21 Dec 2011 01:26:02 +0000 (17:26 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 21 Dec 2011 01:26:02 +0000 (17:26 -0800)

Trivial merge