From: Scott Main Date: Mon, 6 Feb 2012 21:07:24 +0000 (-0800) Subject: Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks... X-Git-Tag: android-x86-4.4-r1~1088^2~167 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=52d55d8847764107de444b5fc794a6c21cb7dce6;p=android-x86%2Fframeworks-native.git Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp --- 52d55d8847764107de444b5fc794a6c21cb7dce6