diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:40:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-09 23:40:17 +0000 |
| commit | 1fb156703750f6d0420c0c20192a44168da24c4c (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f3da205ecdbe0a0aeecbd46cc02c47c9d87149df (diff) | |
| parent | a360d5b1589cddc63d88aaec82436a9807334c48 (diff) | |
Merge "[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: c66d66a32d -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions