tree 7f5adb8069a0b8ad8f60ca85bc51ab7235540832
parent 9109ce178e64ab9128501597d58fe9f998524582
parent b070447e39c6d58bbc976b830ec8bc32e8e77843
author Winson Chiu <chiuwinson@google.com> 1607389418 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607389418 +0000

[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into oc-dev am: e9954e149f am: b070447e39 -s ours

am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 4e71b31e0c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I346236b82b70e9f4c72648b71b33e22fc1956bf0