tree 7ea8d3ff6ba8da7d1dbbf9ae8b0a4cc17aa7f875
parent afeb24ebbd542decf7e8dd3a7118d1f67ac3285a
parent 83f71f1227df4690a25719d01ca9b8e87898d05e
author Sudheer Shanka <sudheersai@google.com> 1628668625 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628668625 +0000

[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -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: I472c7d28b702b45537deb67d425dee9503f60a73