diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:32:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:32:25 +0000 |
| commit | 23c2f7da159426d8b9d1bd5eee6243a4349205b9 (patch) | |
| tree | 83316e2a47326cd5ee26bdb4bc9cf1b647c78a54 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ae97066bb9a1bc84abd36d5ad4ab4b3d31385f0d (diff) | |
| parent | dbf3ed5aa6ba6387ab5dbb83afc5c70d495d5610 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f94201861 -s ours am: e1192c36bb -s ours am: dbf3ed5aa6 -s ours
am skip reason: Change-Id I9b242a9fee0acbfb430875061e2d809c00fe4b97 with SHA-1 ce0a50bcde is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12755273
Change-Id: Ide5da93a02181c21a3487a44d491517be53ea686
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions