OSDN Git Service

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

Trivial merge