diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 02:44:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:44:12 +0000 |
| commit | c4338cbaf06b6795d3e4e087713136a2954549f2 (patch) | |
| tree | ccb2f50cb5a8f482890f6cdfe83203280a72b9e2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e23dc6288fbb216a5e527fbee889fde664c8d820 (diff) | |
| parent | caa7cdf76bd677417abfe5b0ea9c1313e7394d5e (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: a4ddd72b36 -s ours am: caa7cdf76b -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: I94d7f8fe810e3a31b6fb8b0208062651b51957c1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions