tree b017c823f43b5056158528c38407004b31582aa7
parent 72bf305335f0136dd373c3eb46ec0d9d8a434724
parent e9ae04bf65c953e4244862ab16aac8233b1b12b5
author Xin Li <delphij@google.com> 1574582976 -0800
committer android-build-merger <android-build-merger@google.com> 1574582976 -0800

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

Change-Id: Icdd88f676555e78ccf96fc429c5427cfdd219116