tree fa1e029d2d204f7d2950cae700a7365f288c47b2
parent 67dcf032a722dab62a15b919bcf717060a2cf166
parent cfee40e0d30aa2d93df2c4633e7573165f0d7337
author Eino-Ville Talvala <etalvala@google.com> 1349911031 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349911031 -0700

am 907e5651: Camera2: Don\'t let unlocks happen during recording.

* commit '907e5651c18d0e25073743a49a685fe1a385939a':
  Camera2: Don't let unlocks happen during recording.