tree 7691c59f08159384908a2e20ff99a2fe8b31499b
parent 30ab77f42d20c33c0aa9e6ffd2b164d096db32dd
author Tom Taylor <tomtaylor@google.com> 1481070374 -0800
committer The Android Automerger <android-build@android.com> 1482187553 -0800

resolve merge conflicts of eafd58a to nyc-dev

Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962
(cherry picked from commit a43c5c5f18d966355a63db194c931e02267a2695)