diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 18:11:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 18:11:17 +0000 |
| commit | c5c49dcd5c2fbb4463663d83cfd3eff8e05bba44 (patch) | |
| tree | 3b40011469d381fb81770104918e067cf41bb89f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 060836bdf742cc790014cf0f2eaa80b4ace92841 (diff) | |
| parent | 8b78a1d7e31355a3ba08e8905e45aefd905ef501 (diff) | |
am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
* commit '8b78a1d7e31355a3ba08e8905e45aefd905ef501':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions