tree bca0afad1274782c9ae29768f00b5a9bbc1f27b0
parent fcfca21b9f6e53b82d5d484c13b24c8e61070354
author Lucas Dupin <dupin@google.com> 1580350505 -0800
committer Lucas Dupin <dupin@google.com> 1580778760 +0000

resolve merge conflicts of 01f94b7cc053049a472481f457593d895ad9eca0 to qt-qpr1-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d15aaa7402e4e08f1630aa29892ad6cd68bd2b1
Merged-In: I34d1d5f9a751c1d7680a5a5941c39b9fe33a473b