tree 1a789a4493ec25e9dcbd15aad563bf19237ed2a9
parent 700fbed73a97a04687cbbab8d7396246691daf69
parent b0382e4d824123fa11934f3ddc1a8be2f9d56a03
author Treehugger Robot <treehugger-gerrit@google.com> 1593545159 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593545159 +0000

Merge changes from topic "api29" am: 55d843fcf1 am: d96b5af9c4 am: b0382e4d82

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

Change-Id: Id5489bab88a226880128d6d5cc173e626d388538