summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-10 00:39:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-09-10 00:39:37 +0000
commit5ad3165f05d7e152a8b8f7cd3a49891a4d16fce9 (patch)
treefba70df36937043bc8a63aebbf5167ae503ec135 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb3582f1937a0e4b88213fbab301d582d6a8da5fc (diff)
parent1a93e26174a8ec2c61c9429b07e771a67f232cde (diff)
Merge "[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours am: 2d983eccad am: d1ff215c87" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions