diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-05-10 01:42:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-10 01:42:26 +0000 |
| commit | ecc6fad658684ec8e65a2365de218c554d94f63b (patch) | |
| tree | e4541ba147f13264f6133047b9dd456abca2adfc /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | be49b65d154125a04c96d4e77994dbbb19e2cd67 (diff) | |
| parent | 4e645f30a9103487e4807f5eb36db9d1098fcf60 (diff) | |
Merge changes Ibff278a6,If6d537a3
* changes:
Revert "Add NATT keepalive resources and methods into IpSecService"
Revert "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions