diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:40:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:40:44 +0000 |
| commit | 9850a02a0a358f0e9e88a460914bc0d6e9205bcc (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 070b3f4a0f6e9279ea73c781e177b551cfab507e (diff) | |
| parent | e92bc73b56c91a65ac7d58c128c1ce0b51f74b72 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f228451841 -s ours am: fc7b7755ca -s ours am: 98d40c621e -s ours am: e92bc73b56 -s ours
am skip reason: Change-Id I1241a12eafa0bdbac59a8ddd4cf6a0637d467b19 with SHA-1 1ba154b14d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12754868
Change-Id: I615ba098466738ea546a587404e08eea17d01828
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions