diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-08 12:34:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-08 12:34:29 +0000 |
| commit | 2c0971eeec76f5a4b0aee890f4a05d47020da2b6 (patch) | |
| tree | bd9e049cc481cfdf96f6fdf59fc9629f9003ad6a /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | d9feaf49719d58cfc4fad203bd10e75253024fa9 (diff) | |
| parent | 3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85 (diff) | |
am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-dev
* commit '3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85':
AArch64: Use long for pointers in services
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions