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