OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 2 Sep 2011 23:02:32 +0000 (16:02 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 2 Sep 2011 23:02:32 +0000 (16:02 -0700)

Trivial merge