OSDN Git Service

am 907e5651: Camera2: Don\'t let unlocks happen during recording.
authorEino-Ville Talvala <etalvala@google.com>
Wed, 10 Oct 2012 23:17:11 +0000 (16:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Oct 2012 23:17:11 +0000 (16:17 -0700)
* commit '907e5651c18d0e25073743a49a685fe1a385939a':
  Camera2: Don't let unlocks happen during recording.


Trivial merge