summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2018-03-02 13:25:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-02 13:25:02 +0000
commitd1bf7733afd26c97321ab43384badb3eb9924283 (patch)
tree98e287cd8652b418568670f86fbadfaaf89ad48b /tools/aapt2/java/JavaClassGenerator.cpp
parent9fae0a82af2be32a6d29001457f686f27e551c4e (diff)
parent1be320a494cd292235d16ce4d155bfb858eaadf0 (diff)
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 am: e5e819f078
am: 1be320a494 Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions