diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 23:52:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 23:52:47 +0000 |
| commit | 45f12eda909b3ac7427d862a8c0978a4d5f94277 (patch) | |
| tree | 5b3ddcfaa0694d340e2062e1e550dc57277663c2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2e441d94272135055a66e121e75f5a292d4e95a1 (diff) | |
| parent | 661d9aca760ab1495838ef64016a40224344a9f7 (diff) | |
Merge "[automerger skipped] Merge "remove sensitive pii from safetynet logging" into rvc-dev am: 6ad8138422 am: de29b83c7c am: e712121b1a -s ours" into rvc-qpr-dev-plus-aosp am: 661d9aca76 -s ours
am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 efa3c1fcca is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12840275
Change-Id: I4d4397fbac364566282a57b44222acf937217a06
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions