diff options
author | Sudheer Shanka <sudheersai@google.com> | 2021-08-11 03:10:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-11 03:10:53 +0000 |
commit | 88bcfad227dd3d9f7902b47eab5cc0646529f0a2 (patch) | |
tree | 17476931768d9fbda1b2da4deb020ca9a25fbdf6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 95e116139c7f4e99b5ebf0cfcdf6d8e3a56da064 (diff) | |
parent | d44234aea4953d7d6ee1ca42a1a1e1bbc6187e9c (diff) |
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301703
Change-Id: Idbda66157ab36d09551fe31fe481a82b7d90cdbe
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions