Commit 2f1b1b87 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am c247759b: (-s ours) am 09fac4c2: am 0d95f5db: Merge "Camera: fix wait for... 

am c247759b: (-s ours) am 09fac4c2: am 0d95f5db: Merge "Camera: fix wait for preview done timeout issue. DO NOT MERGE." into klp-dev

* commit 'c247759b':
  Camera: fix wait for preview done timeout issue. DO NOT MERGE.
parents 9c6415d2 c247759b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment