tree 9c4a43c242bf92beb925b218c7cdad5894a33e18
parent 26a1d639d82d3c94e5cad4f901760d0ea5ee575d
parent 08f0e854c13b586310b371ccbb95216ad67a3e5d
author Xin Li <delphij@google.com> 1599796758 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796758 +0000

[automerger skipped] Merge Android R am: bd1de18562 -s ours am: 5c75942296 -s ours am: 4da961f869 -s ours am: 08f0e854c1 -s ours

am skip reason: Change-Id Id6af168a8a5712ecfdc4d231bae368a75a66757b with SHA-1 21b5d2a6fc is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/1422456

Change-Id: I6ca0c9b3a122f1019c253c5eb475634edd4f20aa