OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Thu, 8 Dec 2011 15:01:43 +0000 (07:01 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 8 Dec 2011 15:01:43 +0000 (07:01 -0800)

Trivial merge