From: Tao Bao <tbao@google.com>
Date: Fri, 24 Jun 2016 06:18:21 +0000 (+0000)
Subject: resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=429a5851d71a07b88726c1931f371b447d2e118f;p=android-x86%2Fbuild.git

resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp
am: 7df3890039

Change-Id: I4f3dd7b66e0e5807d89cd19542c39dd81ae6ddf3
---

429a5851d71a07b88726c1931f371b447d2e118f