tree dd370f66512bc7b60be3c616534419820fe7aa03
parent cc642a9bb8558480e530c22862417a16da2d2282
parent 11566f2bfb0e3bab47702c9cf60544266659f40f
author SecurityBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> 1578694472 -0800
committer SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> 1578694473 -0800

Merge android-msm-wahoo-4.4-qt-qpr2 into android-msm-wahoo-4.4

SBMerger: 284775313
Change-Id: I5dc5484b0616cffb2e227fa5277e5bd3263becf9
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>