diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-09-04 04:46:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 04:46:39 +0000 |
| commit | d3328343deaff01cfe5eadf57ac27da30832aabe (patch) | |
| tree | 5169b917db374b81db37b67ae3481e6ee1b8f281 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | a6f32d7ff19319c5ed61d113672f112a6f54c938 (diff) | |
| parent | f264080d227617d431804e110e65cc154e8a8d17 (diff) | |
am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit 'f264080d227617d431804e110e65cc154e8a8d17':
Resolve color xml attributes properly. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions