diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-01-28 21:38:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 21:38:43 +0000 |
| commit | d732f561b24e643676812855396d0c9b9138b4c8 (patch) | |
| tree | 75d7b35190d736af0a61762c650f443b4ee1eccd /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 8773d51eae2a40d95adfe517476e9098eec14166 (diff) | |
| parent | 2c6b048bed296949878318a7c60faf247f538e67 (diff) | |
am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db
* commit '2c6b048bed296949878318a7c60faf247f538e67':
jni: Resolve build warnings
jni: Incorporate liblog reading API
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions