diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 16:58:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-29 16:58:51 +0000 |
commit | 61b4ea3a119a4f3b7e04e9ba2190243b2daf001b (patch) | |
tree | fcb91453cdad792dce37c8af4b151d3ea495b603 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fae6068e4a6da2bfe110a4370ebed38b444ca212 (diff) | |
parent | e5e337c6e9cddfc70bc2d234add395c5bda8647f (diff) |
Merge changes from topic "am-741f8472fc2540b58147ecfdb6b79484" into rvc-d1-dev-plus-aosp
* changes:
Merge changes from topic "rollback" into rvc-dev am: 724bc71208 am: 689ae63d5c
[DO NOT MERGE] Fix NPE from uninitialized object. am: b8544eab9f am: 6be388d12e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions