OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 30 Aug 2011 20:42:54 +0000 (13:42 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 30 Aug 2011 20:42:54 +0000 (13:42 -0700)

Trivial merge