tree 8adc03f8df41cb63ac7e6cf99ba1f3b33edce94f
parent dcb6f94d095b2e15a8c924d986a3d850b7b13b83
parent 08acce5b16beef4be30c5d0567d3452aa7e99c26
author Sascha Haeberling <haeberling@google.com> 1397265356 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397265356 +0000

am 08acce5b: (-s ours) Merge "DO NOT MERGE Don\'t call stopPreview after taking a picture on the m8" into gb-ub-photos-denali

* commit '08acce5b16beef4be30c5d0567d3452aa7e99c26':
  DO NOT MERGE Don't call stopPreview after taking a picture on the m8