OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 12 Jan 2012 22:12:13 +0000 (14:12 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 12 Jan 2012 22:12:13 +0000 (14:12 -0800)

Trivial merge