commit | fc4cba361949d1fe059ae316642276f4fad23263 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Wed Sep 24 22:27:36 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 22:27:36 2014 +0000 |
tree | 66bf071223b97ce49c60fc759846ed0bc28fd0e5 | |
parent | 30a28affe1223174ac2e8d35ef8ce8502e276f09 [diff] | |
parent | c4b79198825529a4a40a12157c1f9310f8dc6f62 [diff] |
am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev * commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c': camera2: Increase preview frame timeout