diff options
| author | Nikita Iashchenko <nikitai@google.com> | 2020-11-05 10:19:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 10:19:49 +0000 |
| commit | bce0208847388a2b2e9243658ca348c74aeb850a (patch) | |
| tree | 62b6fbdb2d280698d640bdca894758f6dda13a83 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dd64b2cbf9e538397a3574a89cc6a29892f4cc1b (diff) | |
| parent | 97f35bbbefe9be8aa74c81a4dd8fff3e52ce2d01 (diff) | |
Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136
Change-Id: Ifb6e71163999d084ccc1f7e648d6caea21e8a0c7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions