From: Dimitry Ivanov Date: Wed, 11 May 2016 23:22:03 +0000 (-0700) Subject: resolve merge conflicts of 19b669b to nyc-dev-plus-aosp X-Git-Tag: android-x86-8.1-r1~296^2~188^2~262 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2c5e36396c5f7f8f58694a177615ce6b69ccfee;p=android-x86%2Fbionic.git resolve merge conflicts of 19b669b to nyc-dev-plus-aosp Change-Id: If66754e3a9992ceb5f51173c794c7658ec5ee775 --- e2c5e36396c5f7f8f58694a177615ce6b69ccfee