commit | 7d85be1126076ed233aede6090fb66f1313e752a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:26 2020 +0000 |
tree | caa3460fd4acb36ddfb30a917a8ba8ccd465a3c8 | |
parent | 6c8cb0fa903fc5597ddd487f1bcd862b864e00b1 [diff] | |
parent | 7ba238f85c8312050510f46fbf0978bda88fa422 [diff] |
[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