diff options
author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:26:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:26:52 +0000 |
commit | 8df04e3975060e8c01138777bac5a60e309d33d7 (patch) | |
tree | 4d74103311b8d8542e4c985050fa015c997983e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5f94201861ed12125b3eb9b4aa6c36c9abc19b15 (diff) | |
parent | ade9bc9a97330d90164a5c7d9371afd0b1f0dfc1 (diff) |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: Ife81758afa7c259c24aff314963461e8f7c24d7c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions