OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Tue, 15 Nov 2011 14:46:41 +0000 (06:46 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 15 Nov 2011 14:46:41 +0000 (06:46 -0800)

Trivial merge