OSDN Git Service

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

Trivial merge