OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Wed, 26 Oct 2011 14:05:34 +0000 (07:05 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 26 Oct 2011 14:05:34 +0000 (07:05 -0700)

Trivial merge