diff options
| author | Igor Murashkin <iam@google.com> | 2014-09-24 21:07:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-24 21:07:24 +0000 |
| commit | c4b79198825529a4a40a12157c1f9310f8dc6f62 (patch) | |
| tree | ba5484bb30bcebe57f2c5d71dda6540fd2444912 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b266728cce07b58d2f998e0c75941ec7c53097a0 (diff) | |
| parent | 1dbf7248eaafd8a44b972b2b6d77c5a6c34fd112 (diff) | |
am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
camera2: Increase preview frame timeout
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
