tree 22c56c00bb0175f63d1dafee59dcd19389fe42f2
parent db631e7f9734cc378a1bf41d5e17508941f97a58
parent d65611bf85f9da7a5215382ac949dc0fdf4be24e
author Xin Li <delphij@google.com> 1574448969 -0800
committer Xin Li <delphij@google.com> 1574459803 -0800

Merge QQ1A.191205.011 into stage-aosp-master

Bug: 144955631
Merged-In: I482ace6717063630d3c5018c471601cfd21a2f19
Change-Id: I4e52c840563ce3fc739adadf8f9eeb3178afffad