tree 1c135e5e2d0e85f84451fcc21e8ad3ea6ad8c91e
parent 535cd59c6c3a92bc47e9f8c2ceff2d9b908c4b41
parent c7d9fcd0e0d6351286ef1fe5e84e4b2b3203e7e7
author Xin Li <delphij@google.com> 1574697133 -0800
committer android-build-merger <android-build-merger@google.com> 1574697133 -0800

[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master am: 5cc9ace295 -s ours
am: c7d9fcd0e0 -s ours
am skip reason: change_id I482ace6717063630d3c5018c471601cfd21a2f19 with SHA1 8b406b8d31 is in history

Change-Id: Ieb7156ac64ea849500184c5bff723ffc321ba84a