summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 00:07:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-05 00:07:41 +0000
commit7846b824e0e2ed1bffdd486374e7930c0c13d53f (patch)
treeb55c7930e011ad35d10d9fe805137f1e1367f1fa /tools/aapt2/java/JavaClassGenerator.cpp
parent1e4324893803c26010b3d6a19ab59ecb42258195 (diff)
parentede31cad1ceabf581668a86fd0504af413e4bc80 (diff)
Merge "Add separate user consent for Platform VPNs" am: ede31cad1c
Change-Id: I38ceff087e37f6ede6819e706c36ee9129a1cc6b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions