OSDN Git Service

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

Trivial merge