OSDN Git Service

am 437a7488: am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2:...
authorIgor Murashkin <iam@google.com>
Wed, 24 Sep 2014 23:03:13 +0000 (23:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Sep 2014 23:03:13 +0000 (23:03 +0000)
* commit '437a7488196e7935bb4547f095e900db156b844e':
  camera2: Increase preview frame timeout


Trivial merge