OSDN Git Service

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

Trivial merge