OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Fri, 17 Feb 2012 00:24:21 +0000 (16:24 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 17 Feb 2012 00:24:21 +0000 (16:24 -0800)

Trivial merge