OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Tue, 6 Dec 2011 04:36:01 +0000 (20:36 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 6 Dec 2011 04:36:01 +0000 (20:36 -0800)

Trivial merge