tree 67d1b14fc53b098e849ecf71279551dff2e053ff
parent b53045476ce228d510b045276f84f004d3b9eeb8
parent a4fca2c7255367b96fc8012b0fcb62a71343e1ff
author Selim Cinek <cinek@google.com> 1441836955 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441836955 +0000

am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev

* commit 'a4fca2c7255367b96fc8012b0fcb62a71343e1ff':
  Fixed a racecondition where the camera would not launch