diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-01-28 21:42:07 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 21:42:07 +0000 |
commit | 8bb5e66295f4f0f53dce13a877b922dead4639e8 (patch) | |
tree | 47ff1fa7ef3406d7b0e2b60cef7177682cbcbcd2 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | fa970bb1e8ab3cd734f1719ac8590b43d1e40962 (diff) | |
parent | d732f561b24e643676812855396d0c9b9138b4c8 (diff) |
am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db
* commit 'd732f561b24e643676812855396d0c9b9138b4c8':
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