tree 4fb36e836895f3f42b3608a7050da63cd65ed96f
parent b6c9eeb6baef17366d54a7bb6cd024d80a85e690
parent 61ebd5e3e28372e497a5bcf7cc8212007d38e5a6
author Eino-Ville Talvala <etalvala@google.com> 1349393751 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349393751 -0700

am e68eb9b8: am 9942f62d: Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev

* commit 'e68eb9b82d0371324add708e2b2eb45a99ddbd70':
  Camera2: Include JPEG settings in ZSL requests.