tree 33046efafabc33d954cfcd14b0eddfa72e03027d
parent e62b815c8b21915c0cf3459b0f7424bc52b899c4
parent 128a2fa0021d2ef0bc1d1932cbbd877c69465c74
author Ruben Brunk <rubenbrunk@google.com> 1452531364 +0000
committer android-build-merger <android-build-merger@google.com> 1452531364 +0000

am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration.
am: 128a2fa002

* commit '128a2fa0021d2ef0bc1d1932cbbd877c69465c74':