OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Wed, 25 Jan 2012 20:07:31 +0000 (12:07 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 25 Jan 2012 20:07:31 +0000 (12:07 -0800)

Trivial merge