tree 32004465065b431a8ed1c140d25898dee2cee756
parent d42fc3b49cda5c21aee74f0ec7bd06e1bcab8731
parent 47983a039473f3848647c93278e2d4ae9a5eff51
author Haibo Huang <hhb@google.com> 1556926526 -0700
committer Haibo Huang <hhb@google.com> 1556926756 +0000

resolve merge conflicts of 47983a039473f3848647c93278e2d4ae9a5eff51 to qt-dev-plus-aosp

Exempt-From-Owner-Approval: Solve merge conflict
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idc64b93a422757ad92113b2902908d96730c772e