tree a8e98f35d36062327b476b7b0fb0c638b8a3271a
parent bdb7a4e7ace89539921c593535ae603143fd9d61
parent 945e7042a0bc24e4c1e7f0c03aec0dddd9d01af6
author Shuzhen Wang <shuzhenwang@google.com> 1560275868 -0700
committer android-build-merger <android-build-merger@google.com> 1560275868 -0700

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

Change-Id: Idc4b2440a748e3b77f6bb75a3f2c221a6056198c