tree a50834cbeca3e442ab3b5ab57042992de0853191
parent 512f14cfb64ae9f5ab11596774419a55cf6f5c84
parent 2ffa005793a878f7b6616b1458d31be1a68841b5
author Myles Watson <mylesgw@google.com> 1557514882 -0700
committer android-build-merger <android-build-merger@google.com> 1557514882 -0700

resolve merge conflicts of 7fb9e673dfdcce7ba5b41fa487586c5c7c91b6f5 to oc-dr1-dev
am: 2ffa005793

Change-Id: I10c499c0a96dca9e8de7817aee0df853549cca04