tree d0806622a9b82c9c3bc14d7db30c8795f73351bc
parent c40c87f0cd0c4a8c5bfe6132ebe4bb13ead4052c
author Andrew Scull <ascull@google.com> 1484321316 +0000
committer The Android Automerger <android-build@android.com> 1485200455 -0800

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev

Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
(cherry picked from commit eb35ad9969a173ac4d6279a5e322e8176c2ae6d1)