tree 80adb9a186fd5a1188783e28bbb4895707018038
parent 4f26540a677eddcd55a0c4bc8174d966327cb09e
parent a194bc71da95c114998da6917c41ce0af487c6ef
author Treehugger Robot <treehugger-gerrit@google.com> 1591899531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591899531 +0000

Merge changes I089f3922,I3a52a472 am: a194bc71da

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1318832

Change-Id: I212bee17686adcf19c29121a5664b44e0b2859a8