OSDN Git Service

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

Trivial merge