diff options
author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:40:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:40:33 +0000 |
commit | 070b3f4a0f6e9279ea73c781e177b551cfab507e (patch) | |
tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 11f5107a6b14690c1919ed5a1a38629de6ceeffa (diff) | |
parent | c790cbb8e66431b49a860b9a361b28d4ddbf96d0 (diff) |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-dev am: 7944148774 am: f566c3611e am: c790cbb8e6 -s ours
am skip reason: Change-Id Ie5a0f8c3e9b92d348a78678a6ed192d440c45ffc with SHA-1 09c1b8ebf9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12750223
Change-Id: I9a0f53d418f08b303dbfed3ef6baf5dc61d0d225
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions