From: Adam Powell Date: Wed, 7 Dec 2011 00:57:35 +0000 (-0800) Subject: Merge "resolved conflicts for merge of 6a828712 to master" X-Git-Tag: android-x86-4.4-r1~1471^2~318 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=165e6c01cab2c8d395493f93a4270c1cc24a2901;p=android-x86%2Fframeworks-native.git Merge "resolved conflicts for merge of 6a828712 to master" --- 165e6c01cab2c8d395493f93a4270c1cc24a2901