OSDN Git Service

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

Trivial merge