From: Mohamad Ayyash Date: Wed, 24 Jun 2015 22:04:38 +0000 (-0700) Subject: resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev X-Git-Tag: android-x86-6.0-r1~144^2~10 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ca7fa89;p=android-x86%2Fbuild.git resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev --- 9ca7fa8993bceb97a6256b60742eeda2f699560b