tree 9c2c0b376f5a121331c8f50fbb64fa163a212e35
parent e7d56fda7eccbf14fd4cabbf52fe513637c425cc
parent f35c310b1acc5898811c9ec9b7978bc5da50d507
author Peter Qiu <zqiu@google.com> 1483562481 +0000
committer android-build-merger <android-build-merger@google.com> 1483562481 +0000

resolve merge conflicts of fe09754c1 to nyc-dev
am: f35c310b1a

Change-Id: Ie8d68a8964d49b629e37d79dd14dac7e523f1461