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