OSDN Git Service

am f5230955: am 907e5651: Camera2: Don\'t let unlocks happen during recording.
authorEino-Ville Talvala <etalvala@google.com>
Thu, 11 Oct 2012 00:22:53 +0000 (17:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 00:22:53 +0000 (17:22 -0700)
* commit 'f52309555013e9909b248374f96d22dae29f6454':
  Camera2: Don't let unlocks happen during recording.


Trivial merge