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:39:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:39:09 +0000
commit7681dc175cf900dabf01ea2a667ca4a83347eab2 (patch)
treefeea5855614948fcab525e76583613e925687f1e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent102e9c59050b9cc7c68395072007d277d58a1dd0 (diff)
parentd8c53a1c5e0c4f37522520ff59531375d39955bb (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c am: d8c53a1c5e -s ours
am skip reason: subject contains skip directive Change-Id: I1ceb382406b7b39714eb04480df10b23edf42d1c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions