From: Tao Bao Date: Fri, 24 Jun 2016 05:36:14 +0000 (-0700) Subject: resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=707c4ae757322efd04d9dd7b75bd31135b73bcf7;p=android-x86%2Fbuild.git resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp Change-Id: I392b6798ad68af80d13b7e45f7b7381b19a501ac --- 707c4ae757322efd04d9dd7b75bd31135b73bcf7