tree d20704db31462c6f06b5565ff74698129303d634
parent 56ac6f1ee79e4214471eb6cf2a786a8670df302a
parent 6948bc8ce188f141630a8db169b955bb96ffea85
author Neil Fuller <nfuller@google.com> 1566551055 -0700
committer android-build-merger <android-build-merger@google.com> 1566551055 -0700

Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master
am: 6948bc8ce1

Change-Id: I14075dad9f3242425b11ff78ed74e87acaad289d