OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Sun, 13 Nov 2011 15:01:31 +0000 (07:01 -0800)
committerThe Android Automerger <android-build@android.com>
Sun, 13 Nov 2011 15:01:31 +0000 (07:01 -0800)

Trivial merge