From: Adam Powell Date: Thu, 8 Dec 2011 02:18:58 +0000 (-0800) Subject: resolved conflicts for merge of db81dc72 to master X-Git-Tag: android-x86-4.4-r1~1471^2~279 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c12ba312a4daa11360a2ad40bcc10dfc4af46db2;p=android-x86%2Fframeworks-native.git resolved conflicts for merge of db81dc72 to master Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444 --- c12ba312a4daa11360a2ad40bcc10dfc4af46db2