OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 5 Aug 2011 18:17:49 +0000 (11:17 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 5 Aug 2011 18:17:49 +0000 (11:17 -0700)

Trivial merge