diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:32:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:32:37 +0000 |
| commit | 27a3733949d08a4ed33f25f6a09f7f3af0b34fef (patch) | |
| tree | 32be072ff1ebac35704c3be91b35bd3123985473 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 994c01025653000680c4b5ed2d34d07574929e7e (diff) | |
| parent | 292c75a05a57b8f2021167ca4ffc165a45e11348 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f94201861 -s ours am: e1192c36bb -s ours am: dbf3ed5aa6 -s ours am: 292c75a05a -s ours
am skip reason: Change-Id I9b242a9fee0acbfb430875061e2d809c00fe4b97 with SHA-1 ce0a50bcde is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12755273
Change-Id: I7373f2f3de49b48d326fa647077a76782276d182
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions