diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 02:43:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:43:35 +0000 |
| commit | 4e88280ae30061621d56cd4155baf7dba85506e4 (patch) | |
| tree | ccb2f50cb5a8f482890f6cdfe83203280a72b9e2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 49e948b5961874c5a52eac9a4218f5311e7f945b (diff) | |
| parent | aa6bce1664a53847ce65688e53d06bedc8a7f84c (diff) | |
[automerger skipped] Merge "[WIFI] Make Aware + Connectivity agent network specifiers sensitive" into pi-dev am: 8a0ab48cb4 -s ours am: e83871ae6a -s ours am: 7681aae091 -s ours am: a580cdd025 -s ours am: 4e30ab99c5 -s ours am: 9aa30dd2d4 -s ours am: aa6bce1664 -s ours
am skip reason: Change-Id I9673107a2ee13bca63539fc7dbee7f376af3ebcb with SHA-1 753e63c0f5 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12322905
Change-Id: I17b3dc0579d3ca139815d7666ea0dd6c2b7de67f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions