diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:02:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-10 01:02:33 +0000 |
| commit | 7286ea5ca3eda75a03969331af9c35052c6fc264 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8549538e5bd2f7ac5f968887359dca513d3aa62a (diff) | |
| parent | ac72a7ea90a85999d2dbc12601ca4ad3c7bad33b (diff) | |
Merge "[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: 8d6fe62426 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions