diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 04:14:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 04:14:41 +0000 |
| commit | 0ddd915fb1d0add3bcab269abc1f8f46e2135b7a (patch) | |
| tree | 7a33febbd2ef5337940920352817f1bc9fcd9726 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1c3a884519dc5937bf321519d6adafb41a333bc1 (diff) | |
| parent | 509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe (diff) | |
am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
* commit '509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions