diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 01:33:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:33:24 +0000 |
| commit | fb7ce33912b058a7d9898c532ab48ee92aeb161c (patch) | |
| tree | 83316e2a47326cd5ee26bdb4bc9cf1b647c78a54 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c9e6f5486059aee431922673c78a64108d0a0a3a (diff) | |
| parent | e65d59eb5f1aaff3fa598c0aa9fbb4db92020f00 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours am: e65d59eb5f -s ours
am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285
Change-Id: I6e6f5a550a3a42b83c0fc323b41da84f53577a11
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions