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