summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-23 02:39:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-23 02:39:26 +0000
commit343301a6249eec9c98a57b9030ef20eed74e52ca (patch)
treef7e599b5eb2c9c7b3fbe472dd2a7bea4f9190e6e /tools/aapt2/java/JavaClassGenerator.cpp
parentbe04f7247a5835bcba2f598e9d47e0a07d08af3d (diff)
parent0c0fd01a61505332f199f46d67f67c3752fe11ec (diff)
Merge "Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: c6a49bb008" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions