From: Mathieu Chartier Date: Wed, 27 Aug 2014 21:31:30 +0000 (-0700) Subject: resolved conflicts for merge of a42d23a7 to lmp-dev-plus-aosp X-Git-Tag: android-x86-6.0-r1~145^2~2112 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d9abcd1a08fb76159e90ac86e28879016d51d9e;p=android-x86%2Fart.git resolved conflicts for merge of a42d23a7 to lmp-dev-plus-aosp Change-Id: I0258f55e8199c06948878ba0e9bf7941bf60a435 --- 0d9abcd1a08fb76159e90ac86e28879016d51d9e