OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Sun, 30 Oct 2011 13:46:22 +0000 (06:46 -0700)
committerThe Android Automerger <android-build@android.com>
Sun, 30 Oct 2011 13:46:22 +0000 (06:46 -0700)

Trivial merge