OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 23 May 2011 13:40:30 +0000 (06:40 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 23 May 2011 13:40:30 +0000 (06:40 -0700)

Trivial merge