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-02-08 02:15:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-08 02:15:07 +0000
commit765913391fa6de1ec36847c662203c117d509ed3 (patch)
tree657e55e66f27d3adb56914e9f5afc995df044996 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta33c208f0cb3b6d96275e01d0ce3b38450afe22a (diff)
parent7cb841c9a8719c7ae02c8d6bba81a6d357947fb7 (diff)
[automerger skipped] Rename Light to LogicalLight to avoid namespace conflicts when adding am: b19593a5c3 am: b500354545 am: 7cb841c9a8 -s ours
am skip reason: Change-Id Id5f7bfc74cef6d584c42712fcbea816e456b8b2d with SHA-1 f773e10a99 is in history Change-Id: I7744f71cdc85df03644cb7a293e9c0537bd7d9ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions