diff options
| author | Doris Liu <tianliu@google.com> | 2016-07-16 00:04:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-16 00:04:42 +0000 |
| commit | 58eaa13f18cfa17c7f2073dc8ee022e98af091c4 (patch) | |
| tree | 7d3e93593a1d2310ad8f20c4455887f4dcb9e67f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 17e94691c2fe290d3ed9e06aa48709d062e82b40 (diff) | |
| parent | f5b87ce908f43017430c4c47635b1a0b201e5cbd (diff) | |
Merge \\"Ensure native allocation/free is correctly registered\\" into nyc-mr1-dev am: a7272b4cad
am: f5b87ce908
Change-Id: Ic04a562f2c32cb0187713f2b661e35fb3f7f6023
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions