diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 19:49:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 19:49:17 +0000 |
| commit | acf556a29e87c0dda2c68e54234eb552e39e5577 (patch) | |
| tree | 7bb9213cb026e7749e4c60a8e071c8fc75378a7b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 407453a57ba0a0dd67c18aec06ac123cc4606b88 (diff) | |
| parent | b0be99261ae96df7c29856eccc571e54247fa3a5 (diff) | |
am b0be9926: (-s ours) am 889ec192: am a7ce1107: am 19fa86cf: am 5384d40e: (-s ours) 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 'b0be99261ae96df7c29856eccc571e54247fa3a5':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions