tree ba5484bb30bcebe57f2c5d71dda6540fd2444912
parent b266728cce07b58d2f998e0c75941ec7c53097a0
parent 1dbf7248eaafd8a44b972b2b6d77c5a6c34fd112
author Igor Murashkin <iam@google.com> 1411592844 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411592844 +0000

am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev

* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
  camera2: Increase preview frame timeout