OSDN Git Service

Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks...
authorScott Main <smain@google.com>
Mon, 6 Feb 2012 21:07:24 +0000 (13:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 21:07:24 +0000 (13:07 -0800)

Trivial merge