OSDN Git Service

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

Trivial merge