diff options
author | Joe Fernandez <joefernandez@google.com> | 2013-07-30 20:14:23 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-30 20:14:23 -0700 |
commit | 8028960b7ecd667005839690b99de2cc7cc48862 (patch) | |
tree | 8fc12c165a3a209ec62381ba7e462b428132d4cf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 9010ef5545f2f657268e8afd1f2e181f1406abb8 (diff) | |
parent | bd6ace699c1db01117c6b6e4dd4899ea4c674007 (diff) |
am bd6ace69: (-s ours) am 50bbc0ca: am 465c7c26: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: NDK r9 Release Notes (w/download size fix)
* commit 'bd6ace699c1db01117c6b6e4dd4899ea4c674007':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: NDK r9 Release Notes (w/download size fix)
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions