diff options
| author | Erik Kline <ek@google.com> | 2017-09-07 16:48:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-07 16:48:57 +0000 |
| commit | a0991bdc14ea499e0f6dad8ab223fb96c7aa204f (patch) | |
| tree | 3963293704d9a724a3fd2a48562fdbfc19b4e819 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4de11ebc0f2ab376869f1473d657f499e15a4315 (diff) | |
| parent | 4fae111ca244714ddfae75f6f6afa0f4e5dfa36f (diff) | |
Merge "Support NAT keepalives" into oc-mr1-dev
am: 4fae111ca2
Change-Id: I82ac60e5ad79ec64a13df6ec56b5b51b223f8dde
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions