diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:32:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:32:43 +0000 |
| commit | 55311a446b70ce70c8880fc619caa3b9077ac62a (patch) | |
| tree | 83316e2a47326cd5ee26bdb4bc9cf1b647c78a54 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 23c2f7da159426d8b9d1bd5eee6243a4349205b9 (diff) | |
| parent | a82898ba3468afbc3fdfb38cb49250afcf3a0d93 (diff) | |
[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 skip reason: Change-Id Iee6af379515385777984da55048c1efd9339ed88 with SHA-1 be924dac10 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: Iec3b1a3405e7299d51606e4c231bfa228f5b1c14
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions