diff options
author | Sudheer Shanka <sudheersai@google.com> | 2021-08-11 03:52:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-11 03:52:01 +0000 |
commit | 747d072400c05fc2f206241ae56c133089dba2ec (patch) | |
tree | 60abce5d6ea812949b9a158cb03e01e2ebbeac42 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 99f4a6ef846f0aeff8edf61eb372b73bda5b516a (diff) | |
parent | 88612b95d4c8e9a6cd19c3e2a3fb5a46712966a8 (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: 0e04f5ea34 -s ours am: 88612b95d4 -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: I5a7fc04fe64158688cd7a7c9aef0345e1c4500c1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions