commit | 519dcb07b25df2092f80cff3660c19db9e815667 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 14 21:18:58 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:18:58 2020 +0000 |
tree | 9c4a43c242bf92beb925b218c7cdad5894a33e18 | |
parent | 4da961f86967d5492647f07d0377535b1332acd2 [diff] | |
parent | 2da4d799c75df219d3deebe0db7a32c5eeb99c00 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 2da4d799c7 -s ours am skip reason: Change-Id I481d870a5b390bcee76e68a02d8fb2a8299d6bd4 with SHA-1 4da961f869 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/12579462 Change-Id: Ie54e5d06722d866888bf58ae3202a5f4030d4897