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)
commit9c5b1ffcd7827d7f9fe0e10c6d5d17b3743a79b0
treede0e5a05353c49cb8515a336f6307ea1b4e92bb0
parentcc043e9cfd0a936355a5d5003250edff09607a8f
parent41882cd269e86e8fe97b0d4e0d3b8196aa9f8ef4
am 437a7488: am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev

* commit '437a7488196e7935bb4547f095e900db156b844e':
  camera2: Increase preview frame timeout