diff options
author | Vinod Krishnan <vinodkrishnan@google.com> | 2014-04-15 23:51:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 23:51:48 +0000 |
commit | 6f23e6d622dc07782122e4c5ee985c247da781a6 (patch) | |
tree | b1c5a328c9e4e4a921cae27eaafa27206288144a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d7cc9e3163ee19f9d6acf153209b52c47514c0ce (diff) | |
parent | da34482dfc879e741f1ab2f64a0c1741640186da (diff) |
am da34482d: am 56a90cb8: Merge "Set wearable specific strings in framework" into klp-modular-dev
* commit 'da34482dfc879e741f1ab2f64a0c1741640186da':
Set wearable specific strings in framework
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions