OSDN Git Service

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

Trivial merge