From: Ying Wang Date: Mon, 12 May 2014 23:28:56 +0000 (+0000) Subject: am 8988c93f: am 636dc20d: resolved conflicts for merge of ad495272 to master X-Git-Tag: android-x86-6.0-r1~1626 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cfb7d1b83419c2529ab50bb26bfd934a02c1e544;p=android-x86%2Fbuild.git am 8988c93f: am 636dc20d: resolved conflicts for merge of ad495272 to master * commit '8988c93f79d7bdc5d780d0e0a8ed5ae27468aab4': --- cfb7d1b83419c2529ab50bb26bfd934a02c1e544