summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:08:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:08:26 +0000
commit72cb065b97e8873893c919075aab1c04f7fea0c2 (patch)
treefeea5855614948fcab525e76583613e925687f1e /tools/aapt2/java/JavaClassGenerator.cpp
parent5c1ada4bb3e769c260d305ce02e20db335fb68f5 (diff)
parent3e2869e2c007d7d87330c98f8f01a3a195cc1b53 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2c0 -s ours
am skip reason: subject contains skip directive Change-Id: Ib0708ca164443b156a31dd9082cf0ea259857c36
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions