tree ab52e4c15c717185e7c5bf2e0ff5a0e8821a80c9
parent 3b941378f4bf8b6e5206ef6859df429397f4338c
parent c85f826e7b67bdf159a3f1b01bc9f1f33d05aaff
author Eino-Ville Talvala <etalvala@google.com> 1349224585 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349224585 -0700

Merge "Camera2: Use scene mode override parameter" into jb-mr1-dev