From: Elliott Hughes Date: Tue, 29 Mar 2016 18:27:27 +0000 (-0700) Subject: resolve merge conflicts of 9ce09e4 to nyc-dev-plus-aosp X-Git-Tag: android-x86-8.1-r1~296^2~645 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4aeb851c8f1a8fe86ca0f7eb5a0f8d23f609218e;p=android-x86%2Fbionic.git resolve merge conflicts of 9ce09e4 to nyc-dev-plus-aosp Change-Id: I0b5ac686e45c685e5168a0870570589e2eb82488 --- 4aeb851c8f1a8fe86ca0f7eb5a0f8d23f609218e