commit | 77c32d839d7e208261e25917d3a4acade3b94a41 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 21 07:29:55 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 21 07:29:55 2021 +0000 |
tree | 8b58b409183c85a47bc813de499438afa47062a0 | |
parent | 14d5c2eaa7d61aff101f81572bb281c0432fa679 [diff] | |
parent | e431563a7ce4ae3c5a6ef949fa5d1594f93ad561 [diff] |
[automerger skipped] Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d am: 6c75038336 am: e431563a7c -s ours am skip reason: Change-Id I9f41f888fbd4b7605d750110b345005a5cba85d1 with SHA-1 0d00aef643 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552176 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie0fd240132b5acbe161ccf6cdae07c1d39109b8e