OSDN Git Service

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

Trivial merge