tree caa3460fd4acb36ddfb30a917a8ba8ccd465a3c8
parent 6c8cb0fa903fc5597ddd487f1bcd862b864e00b1
parent 7ba238f85c8312050510f46fbf0978bda88fa422
author Xin Li <delphij@google.com> 1599789746 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789746 +0000

[automerger skipped] Merge Android R am: c22e3be8d9 -s ours am: 7ba238f85c -s ours

am skip reason: Change-Id Ie39341cfc7031188ebc580eb751d86225b81ae93 with SHA-1 47f9a007dd is in history

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

Change-Id: I9b0738c8caaaa32a39ef2c898b23a3cadbae01fe