OSDN Git Service

merge in ics-mr1-release history after reset to ics-mr1
authorThe Android Automerger <android-build@android.com>
Tue, 22 Nov 2011 19:57:00 +0000 (11:57 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 22 Nov 2011 19:57:00 +0000 (11:57 -0800)

Trivial merge