tree 48e2856d03d84f03ef2d376e309ead7b21de01b7
parent 43299a816ea56241905f2f6690cb695c0b76507e
parent a346d8259f25ded77a318d58750e2115b5348811
author Xin Li <delphij@google.com> 1591631808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591631808 +0000

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: a346d8259f -s ours

am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623

Change-Id: Iacc1884e345d9df125b3a9bbf32d1d10d3a4757d