tree 77a2db370b2c548a59c23a6ac0b7f2c2adae252d
parent df97d319f1dfa4fc06adfcc7eacd6445562077f6
parent 7bb66e1097426b4cdc107c47c33b881536446fa8
author The Android Automerger <android-build@google.com> 1402069322 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402069322 +0000

am 7bb66e10: merge in master-release history after reset to 55bd9d56e6c4d53c29e926256203dab91f9b9e9b

* commit '7bb66e1097426b4cdc107c47c33b881536446fa8':
  camera: Fixes for race conditions in abnormal snapshot stop.