summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2021-02-19 17:01:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-19 17:01:44 +0000
commitf9ebe077ff6ef5685bf022876f89b998de33343f (patch)
tree8da08eaa1f1fa540a85a5e660fb94efc0f7d0fbb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent04151fe4ae59d752d242ed4262057889ed63e354 (diff)
parentadf1883ceed822e8c2c0792ddc59c0dc2b8314ac (diff)
Merge "Delete VPN methods in ConnectivityManager." am: e8817c1796 am: 7e292e7920 am: adf1883cee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1594171 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iadf429549b60f96c471a29fb91f12ff340c94cb0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions