diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 01:50:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:50:34 +0000 |
| commit | 5ba661a139d59f15be796c531ec7f2d85edc3e43 (patch) | |
| tree | 32be072ff1ebac35704c3be91b35bd3123985473 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fd72b7c39f189d5066a9775d0e109729e434a4de (diff) | |
| parent | 343b7884724e1d31e57b82baf9752436dc282904 (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: 343b788472 -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: I558536c4a4941372ca56f3f48096ff8b83dda726
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions