tree 89a70f7cfef2f978902fea5c1c58bef9da549ab5
parent 1c915cf30cfafdb7d4edeb4e4d60e7ae475080da
parent 21a3e4d3c7b9cd90a8bb354dbc1b0f806f40fda9
author Yin-Chia Yeh <yinchiayeh@google.com> 1562221612 -0700
committer android-build-merger <android-build-merger@google.com> 1562221612 -0700

Merge "Camera: fix format overriden logic" into qt-dev am: ae59ab3159 am: c40aec214c
am: 21a3e4d3c7

Change-Id: If95aeffd5132f8cdafb837db47ce9ea99f32f516