diff options
author | Xin Li <delphij@google.com> | 2020-09-11 21:27:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 21:27:12 +0000 |
commit | 426d492ae649da3c974d2bf5a36d58f6c5b22d54 (patch) | |
tree | 9b5df1b4a152cf07ef724b04870c5d85b235146e | |
parent | 9e4291c8682bae11896958b3090d0ae5c561fde6 (diff) | |
parent | f5c7f3755f2b16306b6828aa4cdbbcf8c21bfd4d (diff) | |
download | Camera2-426d492ae649da3c974d2bf5a36d58f6c5b22d54.tar.gz |
[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 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: I1a7f4c712568052c51f4711fcfa486483f1bc337
0 files changed, 0 insertions, 0 deletions