OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 11 Oct 2011 12:34:26 +0000 (05:34 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 11 Oct 2011 12:34:26 +0000 (05:34 -0700)

Trivial merge