OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Thu, 1 Dec 2011 14:45:55 +0000 (06:45 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 1 Dec 2011 14:45:55 +0000 (06:45 -0800)

Trivial merge