OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Sat, 3 Dec 2011 00:20:17 +0000 (16:20 -0800)
committerThe Android Automerger <android-build@android.com>
Sat, 3 Dec 2011 00:20:17 +0000 (16:20 -0800)

Trivial merge