tree a8e98f35d36062327b476b7b0fb0c638b8a3271a
parent 00656873f8e955cbe67d289daf78ee354487f21c
parent 988810bb8b61c615f65edfd13853875f6e93a5fd
author Shuzhen Wang <shuzhenwang@google.com> 1560276231 -0700
committer android-build-merger <android-build-merger@google.com> 1560276231 -0700

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

Change-Id: I5cf0e27260439b858d8026ff32c9f004cc7bb639