From: Tao Bao Date: Wed, 26 Oct 2016 22:50:11 +0000 (-0700) Subject: resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp X-Git-Tag: android-x86-8.1-r1~68^2~128 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4a029de94ac4424347f006010d5d2c03ba1bf485;p=android-x86%2Fsystem-extras.git resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp Change-Id: I2c128766ccab4c21ef87b0b87c6b6a517e9280b2 --- 4a029de94ac4424347f006010d5d2c03ba1bf485