OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 7 Jul 2011 19:29:13 +0000 (12:29 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 7 Jul 2011 19:29:13 +0000 (12:29 -0700)

Trivial merge