tree 9205c9733e53d13ae09850c14c95fe5dfd7d89ee
parent 2b6160b90393bd0f4a6b0fbc6f60bc10d5491e08
parent 426d492ae649da3c974d2bf5a36d58f6c5b22d54
author Xin Li <delphij@google.com> 1599864071 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599864071 +0000

[automerger skipped] Merge "Merge Android R" am: 54558abf56 -s ours am: 3696266179 -s ours am: 3e1613cef9 -s ours am: 0554040401 -s ours am: f5c7f3755f -s ours am: 426d492ae6 -s ours

am skip reason: Change-Id I2ed2c7209e2e6ce7364a8a6450c953a3920d8acb with SHA-1 94601bb987 is in history

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

Change-Id: I348f79db5e986b894f57147957d37e7a32ccc620