OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Tue, 14 Feb 2012 22:17:08 +0000 (14:17 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 14 Feb 2012 22:17:08 +0000 (14:17 -0800)

Trivial merge