diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:32:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:32:51 +0000 |
| commit | 0738b20f0e781e53207ce50e4bc0007b9f9d592b (patch) | |
| tree | 32be072ff1ebac35704c3be91b35bd3123985473 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 27a3733949d08a4ed33f25f6a09f7f3af0b34fef (diff) | |
| parent | 66a1743631710ef9c9b566e73d9f237095666fbd (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours am: dc9d907b8f -s ours am: a82898ba34 -s ours am: 66a1743631 -s ours
am skip reason: Change-Id Iee6af379515385777984da55048c1efd9339ed88 with SHA-1 be924dac10 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: I5cdf6c7456a4053ae70efd6574ccabc696112a5c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions