commit | b31719df765a50441da1c043b01264545fdfadbc | [log] [tgz] |
---|---|---|
author | Remi NGUYEN VAN <reminv@google.com> | Fri May 14 07:26:47 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 14 07:26:47 2021 +0000 |
tree | 0a9da2b0464f55e417cedeb4ce04aedbd97c2e7d | |
parent | 5575ee1b0e3fdb259ddaed74c1f8a303ac6c3376 [diff] | |
parent | e2c64094eb6d26eef7d48ff785b0178e1592e19a [diff] |
[automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: b6084988b7 am: e2c64094eb -s ours am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 a146cf1de6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705549 Change-Id: I15d4f795062ca5f44b9291e14c96e7fa6890e98a