OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 14 Jul 2011 14:07:47 +0000 (07:07 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 14 Jul 2011 14:07:47 +0000 (07:07 -0700)

Trivial merge