OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 22 Jul 2011 20:53:38 +0000 (13:53 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 22 Jul 2011 20:53:38 +0000 (13:53 -0700)

Trivial merge