diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-03-25 20:11:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 20:11:12 +0000 |
| commit | 55a1e78fbd38955a5f5d0f09a517b392cc8199cb (patch) | |
| tree | d174844587772500bef20f4570a7cb429017c903 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | d09550687360544f0659e37f393ba2f5b04b55a4 (diff) | |
| parent | 1555cec2e5452c6d4583dfd3deffbb28ebd886fe (diff) | |
am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit '1555cec2e5452c6d4583dfd3deffbb28ebd886fe':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions