diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 18:57:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 18:57:25 +0000 |
| commit | 79feb7c2d72e3efe9a35bcfcc5eda67c9d4a8d05 (patch) | |
| tree | d24eb93b4db64ef97840ac995cc82afc0286b4e0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0fb28eab21e57bc4f1348c0e1b580df52927ce4c (diff) | |
| parent | 81f4b8e19eb4c89bb4eb71e6f0c08aacec377593 (diff) | |
am 81f4b8e1: am b806bde9: am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
* commit '81f4b8e19eb4c89bb4eb71e6f0c08aacec377593':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions