summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-08-02 23:04:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-02 23:04:34 +0000
commite57175c090629bfec1cf54b4f48aa6d91bf02850 (patch)
treed57b033a892e88dd1ea80922234eb95b5ab3b8ab /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1cec6be3f5b66f7f557d07cf1271d1329319358d (diff)
parentab87b6dc0b184bb2bed4c4464f8c0c9926ba8c65 (diff)
Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions