OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Mon, 30 Jan 2012 21:21:49 +0000 (13:21 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 30 Jan 2012 21:21:49 +0000 (13:21 -0800)

Trivial merge