commit | 3968f72db72acded0a0c51d8b156f58e06f538c6 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 22:09:41 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 22:09:41 2020 +0000 |
tree | 8a3950f03b69884eda5ad8cb1597530f02fb02ac | |
parent | ae881e9739280a93c7d9cfa6a6b01af9e749d3a7 [diff] | |
parent | 265fe314e2af96fd954e0758e607d07e3597c1ca [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 94601bb987 -s ours am: 574c98c925 -s ours am: 265fe314e2 -s ours am skip reason: Change-Id Icf5e0a7e5ca76ead5dd686a2c26da0f0db5e16f9 with SHA-1 6290d40e02 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/12485048 Change-Id: I26a1bb040445832183d43eebed5e7298eb563def