tree b5d5156056ec2b484b0140c743161be2c3f397cf
parent a77566e552fcfc3ad914b8505684cbaabbbcb5f1
parent 7bb8ed51c8eb4f59568922432cd2f7858f12ae0e
author Xin Li <delphij@google.com> 1574448969 -0800
committer Xin Li <delphij@google.com> 1574460148 -0800

Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: I758f777e205c568942abcdda31f2a0cea7cdc08e
Change-Id: Ie5648284e5872b2a1c936a6682bf39ab61486a14