diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-01-29 12:20:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-29 12:20:15 +0000 |
commit | 97cae3eae6c9abbd74ff4206dcaba350caafb99b (patch) | |
tree | 89073798e4f12601e9101f081a10b26305d4491b /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 2b033dce9f252ae30ac88c9ba1569d18afaaf2cf (diff) | |
parent | c0b540dc8744eceabfcf09a45ec964cb9709027a (diff) |
am c0b540dc: am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db
* commit 'c0b540dc8744eceabfcf09a45ec964cb9709027a':
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