diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-28 19:58:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 19:58:27 +0000 |
| commit | fa970bb1e8ab3cd734f1719ac8590b43d1e40962 (patch) | |
| tree | 68e4d77f2daf2d53ffb88622cfbc6f7d3382896f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 8697dc674c7c5f33201d037e1c3ae59d9893a22d (diff) | |
| parent | 8773d51eae2a40d95adfe517476e9098eec14166 (diff) | |
am 8773d51e: resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp
* commit '8773d51eae2a40d95adfe517476e9098eec14166':
Track 64bit changes to android/graphics.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions