am f2eb9594: manta: libcamera2: fix copy-and-paste regression
authorMark Salyzyn <salyzyn@google.com>
Fri, 16 Jan 2015 21:01:24 +0000 (21:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Jan 2015 21:01:24 +0000 (21:01 +0000)
* commit 'f2eb959463914d0928d20fda3fb860365e57ea9f':
  manta: libcamera2: fix copy-and-paste regression


Trivial merge