diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-02 20:08:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 20:08:28 +0000 |
commit | a7005ec4556de2da1f0b055fac66ff159c178dd2 (patch) | |
tree | 011f4753de42604137a46ebd1a38db9b926e32a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1efb1bf4a8e1ba73cda4f5a1eb74113fa398379a (diff) | |
parent | b6c5e099b5d95ce455fa1f9f5ef5dee46d1e89a5 (diff) |
Merge "Move Proxy, PacProxySelector out of Connectivity" am: ae171d864d am: b6c5e099b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4cc62d59b1da5053a4af976e30d411d8f066bbcc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions