diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 02:22:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 02:22:53 +0000 |
commit | 81cd0d8d52f83bf3cc6193dead8aa6486d23bdc0 (patch) | |
tree | 8a43478a358ad339f049a1a1a217b9ffcd0a482f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | aac20cfcb4752a38bb27fb134869868c487d855f (diff) | |
parent | a780eee46244062d699f76875fd05775c2ee92de (diff) |
am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
* commit 'a780eee46244062d699f76875fd05775c2ee92de':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions