Merge "Increase frame timeouts to allow for longer exposures" into oc-dr1-dev
am: 32816e05ce

Change-Id: I766fcdcf5af150a3efad91c1a99b4f6d7d60be18
tree: fd9bbd1a91d87d6d3d9cd0c39631b5fd16c60adc
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk