diff options
author | Jinsuk Kim <jinsukkim@google.com> | 2014-04-03 02:11:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 02:11:40 +0000 |
commit | f60283598751cbbdb65b2a59d2294e23bb4dfb99 (patch) | |
tree | cd8cdb6c37fbe5492789ee6555b1b3e63f388613 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8ccaedb51b0734d2711b8bf86f6ffeb57a5da172 (diff) | |
parent | f2fe3505dac16dfa990fbab56713abab6ba0bc54 (diff) |
am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
Use build property for CEC device OSD name
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions