| commit | 7e64c1c89ae04f053814ea2e26fd33166d3d47df | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:51:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:51:00 2020 +0000 |
| tree | 9c4a43c242bf92beb925b218c7cdad5894a33e18 | |
| parent | 08f0e854c13b586310b371ccbb95216ad67a3e5d [diff] | |
| parent | 519dcb07b25df2092f80cff3660c19db9e815667 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 2da4d799c7 -s ours am: 519dcb07b2 -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: I249d3060383c07673465de6484bd368cb852c75d