| commit | a6300522f509b08e0f2f4c2a843b99a25b96d467 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Fri Jun 06 15:42:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 15:42:02 2014 +0000 |
| tree | 77a2db370b2c548a59c23a6ac0b7f2c2adae252d | |
| parent | df97d319f1dfa4fc06adfcc7eacd6445562077f6 [diff] | |
| parent | 7bb66e1097426b4cdc107c47c33b881536446fa8 [diff] |
am 7bb66e10: merge in master-release history after reset to 55bd9d56e6c4d53c29e926256203dab91f9b9e9b * commit '7bb66e1097426b4cdc107c47c33b881536446fa8': camera: Fixes for race conditions in abnormal snapshot stop.