tree 865b6bded5c4b45bfb769d2eeebd64e5ac8c7b1d
parent 5a8f61fb5a8a3822bc6f1dbf31e2990a26a424b6
parent 34332e46acaee8e4ebea41caf6bb2d9fa60a00ed
author Treehugger Robot <treehugger-gerrit@google.com> 1591901136 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591901136 +0000

[automerger skipped] Merge changes I089f3922,I3a52a472 am: a194bc71da am: db256262aa -s ours am: 34332e46ac -s ours

am skip reason: Change-Id I089f3922ac6f9a5ccffdc672aceeed0e4a99fcb0 with SHA-1 c9e8366659 is in history

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

Change-Id: Id3df25c74867eb182fe8eefab0d62a8483cada70