diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-04 04:12:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 04:12:38 +0000 |
| commit | 8397f75d5128a3e6a87307880dff3fc2320551c8 (patch) | |
| tree | 94837fa06a3416c1bc24cf70db5e241859ec7d38 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6a1cb6207877c542cd3d42866b8fd9449aaff48c (diff) | |
| parent | 89a98351ee3eea2fe3ecb6f3b5fe77ac8083d81d (diff) | |
Merge "Remove NATT keepalive from IpSecTransform" am: c20770fee5 am: 89a98351ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512881
Change-Id: I2ca38b60003595a59deff3b12614f3a8950da91f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions