OSDN Git Service

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

Trivial merge