OSDN Git Service

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

Trivial merge