diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-06-04 17:02:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 17:02:32 +0000 |
| commit | cebb5d1b4b87fbaa5d674ddba6dbe7be145106a1 (patch) | |
| tree | a310f2b61f53e0a604f4c2f4460ed900770e547c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 065ec0f7aeb73765ccd0bd894a717d2ce97d0689 (diff) | |
| parent | c3e9b45da09b8689df1d6d474c68e9db37e948ab (diff) | |
am 20909bb0: (-s ours) Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev
* commit '20909bb03bf636c6168ad19ccb481c7961fdb8a4':
DO NOT MERGE: Added missing entries in the cec device array
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions