diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 06:07:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 06:07:21 +0000 |
| commit | 2d70a5a9d1556f269b8ed79b1f6a896ce8241b51 (patch) | |
| tree | 7a33febbd2ef5337940920352817f1bc9fcd9726 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6a6e63a0efed47fea0b1f080a3092d7931941851 (diff) | |
| parent | 06a31255133bcc21ed2f1d821b5e120fefddc117 (diff) | |
am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit '06a31255133bcc21ed2f1d821b5e120fefddc117':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions