OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Thu, 19 Jan 2012 05:16:51 +0000 (21:16 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 19 Jan 2012 05:16:51 +0000 (21:16 -0800)

Trivial merge