diff options
| author | Igor Murashkin <iam@google.com> | 2014-08-19 18:42:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-19 18:42:35 +0000 |
| commit | 32052c01ffbe35c0f8f11c55c2e9f971263da6ff (patch) | |
| tree | 1a6a0ec329e0206099deef6204e095896a9bbaf5 /rs/java/android/renderscript/RenderScript.java | |
| parent | 2f9aec66ee8ba2dd790b59209ccf79c696f22df9 (diff) | |
| parent | ae0da7a81ca40366393a551170672a5e5c32115e (diff) | |
am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev
* commit '3b690f25d97907486a4fcf9f8c05a89bf25f23fd':
camera2: (Legacy) Add control.sceneMode = DISABLED to templates
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions