diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2021-08-11 04:36:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-11 04:36:23 +0000 |
| commit | e0fdc29bbe033ede9f383db925edf92958dc5996 (patch) | |
| tree | 3d013fd204fc43488226bd5477e372bc0dff8c45 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 11d2126532cf6f4e2ba00523e439d2cd6998ebee (diff) | |
| parent | a3ddc3186d9517c4aae817e8f768907738175e1c (diff) | |
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours am: a7d40af8a5 -s ours am: 776b171548 -s ours am: 7b68389397 -s ours am: f2b8a4e240 -s ours am: a3ddc3186d -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301704
Change-Id: I7c9271948a91e9810ee5ff3971af7fadafacb533
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions