diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-29 08:48:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-29 08:48:24 +0000 |
| commit | 67b2e68a7c1fb3a0468075922580f0dfd280e9d7 (patch) | |
| tree | beb7544cb74cf8f9d60546ca4332e61b3fc3c5b1 /core/java | |
| parent | 1d6e5826d96fd3b56d031fb4f66d17e6d984f4ca (diff) | |
| parent | a678e6b1830746ac56e5e9e2ec83f74639e92548 (diff) | |
Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506 am: 29bed11140 am: a678e6b183
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478840
Change-Id: I476629002e075d01c83f77be8343157dbd66ce9b
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/TEST_MAPPING | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/TEST_MAPPING b/core/java/android/net/TEST_MAPPING index abac81117deb..8c13ef98bedb 100644 --- a/core/java/android/net/TEST_MAPPING +++ b/core/java/android/net/TEST_MAPPING @@ -17,4 +17,4 @@ "path": "frameworks/opt/net/wifi" } ] -}
\ No newline at end of file +} |