| commit | c7d3de9550bacdccaf3cd37b082b05a01dd0c155 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 26 05:46:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 05:46:57 2022 +0000 |
| tree | 21ae0503e64a95481ff9ce59b4d89016aacdc3a8 | |
| parent | 679da630455e243da9c11421240a516a62218b53 [diff] | |
| parent | c1d3a3e783f2a5a9f43d8b0cb6bfa49bb8548f51 [diff] |
[automerger skipped] Merge "Remplace NetworkIdentity.OEM_* with NetworkTemplate.OEM_MANAGED_*" am: 6f39fc9ee7 am: 84f8974ecc am: 3edeb55188 am: c1d3a3e783 -s ours am skip reason: Merged-In I8b980417faf776b9b7b0fbcc4f04525b516452a0 with SHA-1 fe43f4d52d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958663 Change-Id: Iedf57545ea64706c87a9b17e89d9752bf1474268