summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-03-09 17:55:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-09 17:55:04 +0000
commita76d6a0744e9b1c56f97a4b729b418557a90e6eb (patch)
treef7dfe425e47bff201ec69d428d7f38f5503b30aa /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6cec86773e8f870bb56d9f965697b3aa6fea0bea (diff)
parent3eb24a1296edb57b0b27aa02efdf38a149e52d94 (diff)
Merge "Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev am: a9df845321 am: 8dddc5e1f8 am: edb8872513 -s ours am: f08622b28f -s ours am: 86150fa263 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions