commit | d431a648574f36fe219cade08111c4db961223ee | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:39 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:39 2020 +0000 |
tree | 9c4a43c242bf92beb925b218c7cdad5894a33e18 | |
parent | 519dcb07b25df2092f80cff3660c19db9e815667 [diff] | |
parent | 5949990e0a4f1594317e289438f8b5bb29c4782e [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b01d5c4516 am: 5949990e0a -s ours am skip reason: Change-Id Ie54e5d06722d866888bf58ae3202a5f4030d4897 with SHA-1 519dcb07b2 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/1431521 Change-Id: Id462691ba3cf2bec285d12fcbe98581b80245088