OSDN Git Service

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

Trivial merge