OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 14 Dec 2011 14:59:27 +0000 (06:59 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 14 Dec 2011 14:59:27 +0000 (06:59 -0800)

Trivial merge