OSDN Git Service

Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks...
authorAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Feb 2012 18:49:07 +0000 (10:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Feb 2012 18:49:07 +0000 (10:49 -0800)
commit20801d679f2815f12ada84704024b1e3c885da84
tree09b9b21af72d3ec57979d8cde93c63b72e2db7cc
parentc502f3b6de83b64df36a9ff76ab3c803aa89feab
parentc1a5853a7c7b83074a4bc8ff9483cbe231534607
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp