tree d9d08244e7ffce5a36d873c6a27cb49113107ecf
parent 70255455b77d2ab52a606f681e172d6442656ffb
parent 584d868a6bfc0a51ff4c0b6e9ea2b5b9895d3240
author Shuzhen Wang <shuzhenwang@google.com> 1560275567 -0700
committer android-build-merger <android-build-merger@google.com> 1560275567 -0700

Merge "Camera: Compare old and new overrides for finishConfigure" into qt-dev
am: 584d868a6b

Change-Id: Ied6ed85e8429f7b4a20c49254875ce3cd08bb07b