| commit | 148043b2a0a36b3cc391078fdb86d30ffc1a6b0f | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Thu Apr 08 22:58:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 08 22:58:14 2021 +0000 |
| tree | 8752fc087326679797ff4e2c0b08809e754d7aff | |
| parent | 44c5e1fb515f81bc1192f5ae0a78d96c6dfa5848 [diff] | |
| parent | c4c1b9c820eae1bcb2036e0f8d1f9d47054cf822 [diff] |
Merge "Adding OEM Network Preferences for testing" am: ee638e2670 am: bad8f6262f am: c4c1b9c820 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659163 Change-Id: Ia028efd68ae8ce229c5382dc4798671da9124a5b