tree b20aa9b1ffd7052fdbba3fefd93ca97a76bbee65
parent 6d7b37807fc85d9706c6d73b72b2675ef2359667
parent 177da181d77c867f20853ffe645e8b6d58d72dd9
author TreeHugger Robot <treehugger-gerrit@google.com> 1601948020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601948020 +0000

[automerger skipped] Merge "Fix the issue provider can be wrong when requesting slice permission" into qt-dev am: d665f5e619 -s ours am: b3069d3806 -s ours am: fafef50b5a -s ours am: faab5acee7 -s ours am: 177da181d7 -s ours

am skip reason: Change-Id I8b66c02786df4096dad74b7e76255d5ddd1d609d with SHA-1 4344e63295 is in history

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

Change-Id: Ia0aaad07ec4f72414a83c1912c0b34fd5dc69594