From: Gilles Debunne Date: Tue, 6 Dec 2011 23:57:47 +0000 (-0800) Subject: resolved conflicts for merge of fb729202 to master X-Git-Tag: android-x86-4.4-r1~1471^2~325 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eaa88702306d04d2f129376734b33f47e7e0388c;p=android-x86%2Fframeworks-native.git resolved conflicts for merge of fb729202 to master Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0 --- eaa88702306d04d2f129376734b33f47e7e0388c