diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:39:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:39:36 +0000 |
| commit | 8d621a7dd1046e17ede7197b8fcf3b57335dd052 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 158d28a8d0586d1bb26405d98b221378321f6038 (diff) | |
| parent | 4eaf2171706ec3234b7e009fc8af66ce2122bcff (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: 4eaf217170 -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: Id43538ac81846b4e08483a576a96f7be13a90dda
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions