| commit | 5cf26edf2c849040d5ca6eb67e4dd4c29e6fa53e | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Mon Feb 07 22:03:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 07 22:03:17 2022 +0000 |
| tree | 98a0f5f3127e16daa062dadaa03cd8d6494a9ff0 | |
| parent | 3c30a681389c8f36ffe34e807a48982a8fa49b65 [diff] | |
| parent | 2511ec37ee07cd5ba95ce2bfeb3cfe4ebb44ca6a [diff] |
[automerger skipped] Merge "Marking eth network management APIs @SystemApi" am: 6db38c75b0 am: b81bde5cd1 am: 3d646460e0 am: 2511ec37ee -s ours am skip reason: Merged-In I10429441fd4d7b9bcaa7437b844420a43a415d72 with SHA-1 d78a9719dd is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969839 Change-Id: I73b97cc1c34d4a1839c15f2b58d39e5dc767dc3e