OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 24 May 2011 13:41:41 +0000 (06:41 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 24 May 2011 13:41:41 +0000 (06:41 -0700)

Trivial merge