tree 3fa3e4a689575cc2f3dda288d99687c844a900d2
parent ce543946c63b5d9c72f96f06a88d56e13b7a22db
author Walter Jang <wjang@google.com> 1478539483 -0800
committer The Android Automerger <android-build@android.com> 1480538058 -0800

resolve merge conflicts of 9f523b4 to nyc-dev

Bug: 32219099
Merged-In: Ib141ad682488aeabf6d90e8d169d5fff6df7a8dd
Change-Id: I895b1f9f8ade2dcfa47d1c17e0aaac2edeb75a74