OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 10 Nov 2011 14:59:29 +0000 (06:59 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 10 Nov 2011 14:59:29 +0000 (06:59 -0800)

Trivial merge