summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2021-08-13 21:53:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-13 21:53:04 +0000
commit1444f9907fd267359f75438e7f5a351e67ddc722 (patch)
tree674c678bf831a50497d0af238ec4fce08f1619e7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenteb27fe4aaf62a0c96cff93fe468af994ebacebab (diff)
parentcce33c3589004f8e47d1b3c7521ba661553f1a97 (diff)
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours am: cce33c3589 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301699 Change-Id: Idab84936199f2de7fe225ae307db36e667bed96b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions