OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Fri, 27 Jan 2012 02:32:07 +0000 (18:32 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 27 Jan 2012 02:32:07 +0000 (18:32 -0800)

Trivial merge