diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 00:16:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 00:16:18 +0000 |
| commit | a89fc49936fe58819fe2be48200b58947ba61b9c (patch) | |
| tree | 32be072ff1ebac35704c3be91b35bd3123985473 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0738b20f0e781e53207ce50e4bc0007b9f9d592b (diff) | |
| parent | 39d75b0e54199b928e294db6643b90535d20629e (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-mr1-dev am: 1a673296ae -s ours am: 12e7baaddc -s ours am: 50472c1db2 -s ours am: 8fcc7fb762 -s ours am: 57ac383a3d -s ours am: 39d75b0e54 -s ours
am skip reason: Change-Id If5cdf8ffaf3aa7d8a1ac81272e3bfb2cc7cdddf1 with SHA-1 d4774f9101 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768751
Change-Id: I0da8b2d1557b10ca8d60e0f0a57f28bfc0bce9a0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions