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-03-11 05:23:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:23:58 +0000
commitc30148fd7979c8eeaa78ff2d5388ea0475dd5b50 (patch)
tree9c1f5e98951a604a9958a7d0ff4917c11b9bf2a6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0651bb4f3afce1a78fc6696fda08dd77f2f897f5 (diff)
parentcee788f5bdefd494a39fe7a11faed8c320a1aa84 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4bb3 -s ours am: cee788f5bd
Change-Id: I37ff5074f456b99ce450bdb65da44a35b73077c1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions