OSDN Git Service

am e75abda2: am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git...
authorScott Main <smain@google.com>
Mon, 6 Feb 2012 21:11:03 +0000 (13:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 21:11:03 +0000 (13:11 -0800)
commita0b32dbc0a75d8b2b544a268c81ff91131a22e82
treeab32ca45626f919c2563342804d59811704c5628
parentb335185679261201884b7b4e0a0bb38ab6b5908d
parent59015b369ddb4a60587d546d39d2511b2812b60f
am e75abda2: am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

* commit 'e75abda25a4a638599b36ba8dc21fe4ddefd61ab':