diff options
author | Justin Koh <justinkoh@google.com> | 2014-02-20 23:01:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 23:01:25 +0000 |
commit | 0be0a5039b60ae4c1c8c0b6a1a2c0e7400d372d5 (patch) | |
tree | b937df385a408d0709170f3f5b4252a38c22c96c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d85e7840b03b64b2aa75361b739d0316ef1a9270 (diff) | |
parent | 7206ac561291298f08809614be95963966a72ca8 (diff) |
am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev
* commit '7206ac561291298f08809614be95963966a72ca8':
Add hardware feature describing a watch.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions