diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2021-08-13 21:51:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 21:51:28 +0000 |
| commit | ea465067e1f35f163111ca35294f61069ab6d5a5 (patch) | |
| tree | 674c678bf831a50497d0af238ec4fce08f1619e7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 778117f0235febe0f29d5ec2226c1640de3ce9f5 (diff) | |
| parent | 8502712492d54d21e4812e653551bf87e6bbf077 (diff) | |
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 0ce17cddf9 -s ours am: 8502712492 -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: Idf0a200aa1f9140bd487d44b9da3680b123d360f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions