summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-05 15:04:33 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-05 15:04:33 -0700
commit6500b83b4072ec3d5dd33794d0e2e45f877081d8 (patch)
treeed271c1fcd50d2a9f28075c093a34eef1ac39278 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent81d6024d890ae7e441077fafb2d5f58e2f7883a3 (diff)
parent5cdd996e0a6355dfb4a36259c0a98056da54c775 (diff)
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d191463bb0 -s ours am: 2556f35b94 -s ours
am: 5cdd996e0a Change-Id: Ie7b34f06a9600d4e9ddd9587aac1ce2aec5ad12f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions