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