OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 30 Jun 2011 13:44:03 +0000 (06:44 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 30 Jun 2011 13:44:03 +0000 (06:44 -0700)

Trivial merge