summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-29 00:51:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-29 00:51:14 +0000
commitad2bf7dfc92cf523b1dcbd01ae08497168d26c85 (patch)
tree25394a16e8816a89b44aee7b187c75a4220e7ff8 /tools/aapt2/java/JavaClassGenerator.cpp
parent82100f8e586595c1986ab14e1bc41c9365b4cf44 (diff)
parent037ac26f05abb179ef6264ead4c36c55b46cb916 (diff)
Merge "Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am: 60c04126c9 am: ef26bf0f0a" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions