summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-11-11 19:41:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-11 19:41:38 +0000
commita0812043a0da3b2835813beb2d570f028059a254 (patch)
tree2662ab00552061b9cdff4463a8ad5940baa9165a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent034a56dab2f9b23cf35388fc72562e1ec9c3a161 (diff)
parent86e80702895a2ac93264713110e62257264887f8 (diff)
[automerger skipped] Merge "Mark screen decorations as trusted overlays" into rvc-dev am: bb3f22df9a am: b075e50ad5 -s ours am: 86e8070289 -s ours
am skip reason: Merged-In Ib276764edcf1acffe94e3db7397fd23aaaa5dbaa with SHA-1 620ee47b2a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222361 Change-Id: Ic3c020b7b53843c271424c0756686468940fc753
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions