tree debc94f56b80621bdaedc8545a856bbffa98e673
parent 521830d46b1ba07836a643b9e603356fead28d57
author Yuncheol Heo <ycheo@google.com> 1576190989 -0800
committer Yuncheol Heo <ycheo@google.com> 1576190989 -0800

resolve merge conflicts of adc8483604c691dd081433e0e86f0f0da78d31dd to qt-qpr1-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie90d0b9d919c7702816338810a8d31fa821b4e59