From: Roland Levillain Date: Mon, 29 Jun 2015 13:28:23 +0000 (+0100) Subject: resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp X-Git-Tag: android-x86-7.1-r1~2097^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4a666d3892c0b5f5d969a0ad71208f2253068e97;p=android-x86%2Fart.git resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp Change-Id: Id084ba7a4c95479696b0b414dbd29a68b9e7d02c --- 4a666d3892c0b5f5d969a0ad71208f2253068e97