OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 27 Jun 2011 21:24:57 +0000 (14:24 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 27 Jun 2011 21:24:57 +0000 (14:24 -0700)

Trivial merge