diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-06-02 11:43:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-02 11:43:29 +0000 |
| commit | d18fef597699157d3ab1ae1e0a0f8a7a76d993e8 (patch) | |
| tree | 195b87c53dc710ea9d45320d844d74897ac3e843 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ad65c15ab47cc819b433080a5ded08b8062f2b80 (diff) | |
| parent | 15bbf99a52b684b8b6b876cf634d44b58b03c8ec (diff) | |
am 18021f98: (-s ours) Merge "DO NOT MERGE: Hook up the CEC playback API to service internal logic." into lmp-preview-dev
* commit '18021f98b16b609ee6941c0935e5569198bc629d':
DO NOT MERGE: Hook up the CEC playback API to service internal logic.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions