tree 35e79ac29d5c34291ab13c3719aae937124e8b33
parent 54eb2c126d1595eb92ed05415cddb0d1c1535a02
parent c0243f2ff85d3d8d897f34d063177169e736a500
author Pawin Vongmasa <pawin@google.com> 1531471258 -0700
committer android-build-merger <android-build-merger@google.com> 1531471258 -0700

resolve merge conflicts of b92f1d2e1be35b331b18589a8cde81d51ddd31d6 to oreo-mr1-vts-dev
am: c0243f2ff8

Change-Id: Ic39fb2e88c6d0d1c1185dae1fab6d9c42a624187