OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 1 Dec 2011 15:00:52 +0000 (07:00 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 1 Dec 2011 15:00:52 +0000 (07:00 -0800)

Trivial merge