diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 02:43:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:43:16 +0000 |
commit | 49e948b5961874c5a52eac9a4218f5311e7f945b (patch) | |
tree | ccb2f50cb5a8f482890f6cdfe83203280a72b9e2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e8d02eb6f4668a2426ebb8e4dcb86d10009a8678 (diff) | |
parent | ff2b578cbeb5301c32330b5d012a3d452697022e (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: 45f2c24dbe -s ours am: ae30e8804a -s ours am: ff2b578cbe -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: I41f4491e85cae9bd774c5da2756e9318da53a5c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions