diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-11-04 17:22:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-04 17:22:11 -0800 |
| commit | f5e99f130e46cd24f1ba53b56b2a18ad7dd0aa6c (patch) | |
| tree | f4fbc22ce1061e9c1e8b1efbe15bbb2eb018e599 /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | eb69d6f2423d2ebefa6847267b329d5e9b616601 (diff) | |
| parent | 3c2b1975f52de3f838bdfb5543244bb8166d14cd (diff) | |
am 3c2b1975: resolved conflicts for merge of 790f9183 to klp-dev-plus-aosp
* commit '3c2b1975f52de3f838bdfb5543244bb8166d14cd':
Doc change: Platform highlights for Android 4.4.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions