diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 17:33:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 17:33:21 +0000 |
| commit | 5384d40ed4ec8f3546be94e6cae7c0011ef235a5 (patch) | |
| tree | dd16beeacf6b4659b7374b0a4defc9809b6171c2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e19464aae4ba251c758f3b27601ef3470e0a8c2d (diff) | |
| parent | b79bb54e92b03bc032a91084f8a5ab7246136d9f (diff) | |
am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit 'b79bb54e92b03bc032a91084f8a5ab7246136d9f':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions