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)
commit52d55d8847764107de444b5fc794a6c21cb7dce6
tree62ae95e5606b65456e4877a437dfcb3020b7cee1
parent9f36e61a796c2004d7540087ae1c089a2ba6b70b
parentfa585608f4f432d758a51e1e3c42f51f7bb9a233
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp