OSDN Git Service

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

Trivial merge