OSDN Git Service

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

Trivial merge