diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 02:15:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 02:15:58 +0000 |
| commit | aa6bce1664a53847ce65688e53d06bedc8a7f84c (patch) | |
| tree | 4775e35c120dd484fd127a8baf897bd58e3bc14d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ff2b578cbeb5301c32330b5d012a3d452697022e (diff) | |
| parent | 9aa30dd2d4e14c2bc1a18b457a2ddab16fa72030 (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 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: I56eeb269b9347b3cb96418b49a020c25980fe47a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions