tree 053d7181d0d627ffd20274398e6daab63e4501f0
parent 2f6c7f1f323f87a1c0b47a1c075593df1af7cccf
parent 88f044c947720934ae88d2bc18284623f0afabf0
author Xin Li <delphij@google.com> 1574698595 -0800
committer android-build-merger <android-build-merger@google.com> 1574698595 -0800

[automerger skipped] Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master am: e9ae04bf65 -s ours
am: 88f044c947 -s ours
am skip reason: change_id Iadc2d9ce6a4d22c9575c2d7ae36ca68e45d2b5bc with SHA1 68dc999701 is in history

Change-Id: Ibb481cad7f2ed93eb42c727df9dab11cd66f9fcb