am d6d94475: manta: libcamera2: if captured shot drained, record current shot data
authorMark Salyzyn <salyzyn@google.com>
Tue, 2 Dec 2014 17:17:51 +0000 (17:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Dec 2014 17:17:51 +0000 (17:17 +0000)
* commit 'd6d94475d878944562d0f1e16a5b6508fce87e3e':
  manta: libcamera2: if captured shot drained, record current shot data


Trivial merge