OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Fri, 9 Mar 2012 04:45:10 +0000 (20:45 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 9 Mar 2012 04:45:10 +0000 (20:45 -0800)

Trivial merge