OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 29 Aug 2011 13:33:36 +0000 (06:33 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 29 Aug 2011 13:33:36 +0000 (06:33 -0700)

Trivial merge