OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Sun, 10 Jul 2011 13:46:35 +0000 (06:46 -0700)
committerThe Android Automerger <android-build@android.com>
Sun, 10 Jul 2011 13:46:35 +0000 (06:46 -0700)

Trivial merge