| commit | f4965c2c2ed33698548d0d8949d2617f1f278617 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:08 2020 +0000 |
| tree | 9c4a43c242bf92beb925b218c7cdad5894a33e18 | |
| parent | 043de8a5aebe923f23ee9eb39865bc3e7fb37173 [diff] | |
| parent | 224fd31d7bec3395d730ca55b7a7c4a0d23308fd [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b01d5c4516 am: 5949990e0a -s ours am: d431a64857 -s ours am: 224fd31d7b -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: Ib6c809118e1cb3eb8d2804c9a6c68ab8a00a9153