From: Lajos Molnar Date: Mon, 27 Oct 2014 04:18:09 +0000 (+0000) Subject: am 435d9cde: resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp X-Git-Tag: android-x86-6.0-r1~75^2~225 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e98c13ed;p=android-x86%2Fframeworks-native.git am 435d9cde: resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp * commit '435d9cde2777950c1d93b0982839d6796c5688b2': --- e98c13ed66d4c1662e630c242ccfac8fe7274de5