OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Mon, 28 Nov 2011 20:21:55 +0000 (12:21 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 28 Nov 2011 20:21:55 +0000 (12:21 -0800)

Trivial merge