OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 3 Jun 2011 21:56:47 +0000 (14:56 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 3 Jun 2011 21:56:47 +0000 (14:56 -0700)

Trivial merge