commit | 7ba238f85c8312050510f46fbf0978bda88fa422 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:39:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:39:46 2020 +0000 |
tree | caa3460fd4acb36ddfb30a917a8ba8ccd465a3c8 | |
parent | 47f9a007dd68232c741c81d44f25d6637aa7bd39 [diff] | |
parent | c22e3be8d9e81b2bd4c321b6914dc293df6d14cb [diff] |
[automerger skipped] Merge Android R am: c22e3be8d9 -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: I6896801d6218c6772e424320410d9a3e5002c995