OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Fri, 2 Dec 2011 00:45:30 +0000 (16:45 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 2 Dec 2011 00:45:30 +0000 (16:45 -0800)

Trivial merge