OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Tue, 24 Jan 2012 21:33:01 +0000 (13:33 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 24 Jan 2012 21:33:01 +0000 (13:33 -0800)

Trivial merge