tree 8d60e97c750b73858be1b1243e03d9eec35d0c2c
parent c50a74ecdfbec579f7ba0894b8c546a30365e719
parent cf5ed52dae3a8a2fd6dc887b67e58ceb09f2141f
author Shuzhen Wang <shuzhenwang@google.com> 1560276641 -0700
committer android-build-merger <android-build-merger@google.com> 1560276641 -0700

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

Change-Id: Ic87b5d9de0e59f9a465a39e5baf57207a1546ed6