diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 05:32:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 05:32:41 +0000 |
| commit | ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae (patch) | |
| tree | 14b715de9587f5ba917dc29747f0adc225715e82 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e9ea028b74950722163560d5dfb97b4403111cc4 (diff) | |
| parent | 1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5 (diff) | |
am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions