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-21 04:55:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-21 04:55:25 +0000
commit263755f57b0ce6f16a9fe3a12f569fbc13848a1a (patch)
tree5cb6e53834c5ba300b2f000c97a9df1f08729023 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentda52179e8626a42d0e2f1fda571545ce668de87e (diff)
parent8ad89674c23e15f354b9759ae74b382b18acb95b (diff)
Merge "Merge "Fingerprint navigation settings is a secure setting" am: ccf1064825 am: 85f47ce5aa -s ours" into pi-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions