OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Tue, 28 Feb 2012 23:12:45 +0000 (15:12 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 28 Feb 2012 23:12:45 +0000 (15:12 -0800)

Trivial merge