diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2021-08-11 03:36:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-11 03:36:46 +0000 |
| commit | f8e0f5dc74b0d28ade79e5583633d88556895ad3 (patch) | |
| tree | 60abce5d6ea812949b9a158cb03e01e2ebbeac42 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 55a9eb33769066cef6304e84a1191c72729d2612 (diff) | |
| parent | fd6761f57021d4b209feb2a240defe995f6f43c3 (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: 88bcfad227 -s ours am: fd6761f570 -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: Ied8369daba12f1667f9fd46d185ba5f53485263e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions