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