diff options
author | Marco Nelissen <marcone@google.com> | 2014-03-07 01:04:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 01:04:31 +0000 |
commit | 4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce (patch) | |
tree | 3d8a1ed4bb177ab701a9445cd8668399d7963784 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2876797cfba3b8e443c54469dc551a35a1f00ece (diff) | |
parent | daefb17c2516eae398da989b6b2a368a0b843284 (diff) |
am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit 'daefb17c2516eae398da989b6b2a368a0b843284':
libexif is now libjhead
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions