OSDN Git Service

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

Trivial merge