summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2021-02-04 16:49:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 16:49:05 +0000
commitaf14107e13bb4f131f1474d6efc69857cef813af (patch)
treeef2f2d501abda83198d556bf53a200c25c2cd25a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent98eb82a6d3f25ce7c54177f6f780f8cf36c885a1 (diff)
parent57dd6872fd203cd93d955cf560c68790008cf7ee (diff)
Merge changes from topic "nullablecollection" am: 60f3d5cee4 am: 57dd6872fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia6baaacb15e7575f837da727ecbe6643dd93dfb4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions