tree c9150aae583ee04a6120fd37f9784eb3abd78157
parent c99e2e46256b11cae0a424e3341e1c04a3ee2076
parent 3873c920b830fcea2979a5bf6097bfd5810957f9
author Chong Zhang <chz@google.com> 1414010861 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414010861 +0000

am 3873c920: am 168799c3: Merge "release camera without holding CameraSource mutex" into lmp-dev

* commit '3873c920b830fcea2979a5bf6097bfd5810957f9':