tree 053d7181d0d627ffd20274398e6daab63e4501f0
parent e337743cedb972f80d2b31dbfe8691e37d306b83
parent 72bf305335f0136dd373c3eb46ec0d9d8a434724
author Xin Li <delphij@google.com> 1574697142 -0800
committer android-build-merger <android-build-merger@google.com> 1574697142 -0800

[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master am: 7cbf4fee66 -s ours
am: 72bf305335 -s ours
am skip reason: change_id Iadc2d9ce6a4d22c9575c2d7ae36ca68e45d2b5bc with SHA1 68dc999701 is in history

Change-Id: I3f6077dc03cc81e35c05f239eeb08add83ffd419