diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 18:36:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 18:36:21 +0000 |
| commit | 7be53b2447d973b09a0a13daa8533084be2350f8 (patch) | |
| tree | 22561947d0d13aef1956e26547711de6cce4fa7b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3f615bf2f9de920b2c29386e8978b7e5f7613d66 (diff) | |
| parent | a73bc03b2932b6be80976fa012b9bb26783a6fce (diff) | |
am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
* commit 'a73bc03b2932b6be80976fa012b9bb26783a6fce':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions