tree f4840491becb8e7ef4e49258aca1f72741d11913
parent 661ddb92f091eb5356b7765094e397b164c5161f
parent 9ac6ff1df80bb2f3d4eaec61ccfeb7b4e5ab1493
author Eino-Ville Talvala <etalvala@google.com> 1366133489 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366133489 -0700

am 9ac6ff1d: am 480721ea: Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev

* commit '9ac6ff1df80bb2f3d4eaec61ccfeb7b4e5ab1493':
  Camera3: Allow multiple process_capture_result calls per request