summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorPavel Grafov <pgrafov@google.com>2020-07-03 12:02:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-03 12:02:44 +0000
commitc0f3545d4518933ec5dd4a8d53d91e05d218163d (patch)
tree391bf2631e7d0c16eb24965b5d4d4aab317a49fd /tools/aapt2/java/JavaClassGenerator.cpp
parent3d5030e138dfb6fa6b2c3195e8dbd04a97ffbcb7 (diff)
parent87bcf321a908fb6dec3fd824b552f103ba8d1b4b (diff)
Merge "Connectivity: start PAC global proxy after reboot." am: 5ab4cc2a52 am: 77c5848977 am: 6852f5bdb1 am: 87bcf321a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599 Change-Id: I6f3630bc0b1fa148f7ec8d01c339803855e985ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions