OSDN Git Service

merge in ics-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Mon, 9 Jan 2012 15:02:24 +0000 (07:02 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 9 Jan 2012 15:02:24 +0000 (07:02 -0800)

Trivial merge