From: Jeff Vander Stoep <jeffv@google.com>
Date: Fri, 24 Jun 2016 03:44:03 +0000 (+0000)
Subject: resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6fb6aa51a47ab0cb8bcbc3ab21ba68742229b2a5;p=android-x86%2Fbuild.git

resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8
am: b73e902c7d

Change-Id: Ib84efcf8d64e833f93b93b0ce3ddd1f6374949cf
---

6fb6aa51a47ab0cb8bcbc3ab21ba68742229b2a5