OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Thu, 17 Nov 2011 14:47:21 +0000 (06:47 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 17 Nov 2011 14:47:21 +0000 (06:47 -0800)

Trivial merge