diff options
author | Zhijun He <zhijunhe@google.com> | 2014-05-23 22:48:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 22:48:08 +0000 |
commit | 2f6da3e739ef4d9c37dd7e7d2874bb1ef0ce3d15 (patch) | |
tree | 9693a666d93291de55dbc3eeb8cbe7df2ddb86eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 792d52a59bd8cd33190296e2630de2d9f9419989 (diff) | |
parent | c1631fd8908c73b161797919c664edecc9d0c6c4 (diff) |
am 0eb2fa3c: Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev
* commit '0eb2fa3cf88d037f645555e3a1c4644cdf0a67c9':
Camera2: Mark the under-specified tags for FUTURE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions