tree 1dc2402b89bac85ebec30fcd731e814bc0541a16
parent e36936b2852ca0f8486410f6471b10d57e6b9f2f
parent 1588b5afe0ec2debaf24235310573a1dcc0f1f91
author Chenbo Feng <fengc@google.com> 1500409809 +0000
committer android-build-merger <android-build-merger@google.com> 1500409809 +0000

Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1 am: 611e909387
am: 1588b5afe0

Change-Id: Ib92d7051a911f29738be0d2d25e7d3965e2f0796