Merge "camera: Change HDR+ shot hint to 2s" into oc-dr1-dev
am: 0a58196a64

Change-Id: Ic728c867c5e2f81215e92f6e938b514e0cec1ee7
tree: d16ed76350b0e6a7c201503c1e9b8add8c6b74a4
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk