diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 02:31:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 02:31:15 +0000 |
| commit | aaf51d826074614f54266ff59d5c9d69d1c83dec (patch) | |
| tree | e72b5f88e2fee4cff240de76f6006eb6702c1587 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 03985f3faaa8d2f0375362ee5106fc958ba7efd8 (diff) | |
| parent | 5abb897ae377a789e28e8d5900f8bee4f348ded6 (diff) | |
Merge "[automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev am: ffd39d6863 -s ours am: 4a8b72ffc9 -s ours am: d7600974bc -s ours am: 1675411037 -s ours" into rvc-qpr-dev-plus-aosp am: 5abb897ae3 -s ours
am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 6d9794aa9f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12840256
Change-Id: If84f27f9ff8fec8d43e1b2d0ccd72a1163f08c5c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions