diff options
author | Xin Li <delphij@google.com> | 2020-12-03 04:39:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 04:39:52 +0000 |
commit | 61392d71b3e943b25361bbd6c045ea2050f78a12 (patch) | |
tree | 0ad4df786f848e7510639b08adbb0b53123230a2 /camera/common/1.0/default/CameraModule.cpp | |
parent | 9135ee103e6ae13a530bf44567a1f101da6b40f5 (diff) | |
parent | 3be8d4f26c6190ee6c9d8b4f26c848b1c457c1c0 (diff) |
[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 8ac301f5f1 -s ours am: 3be8d4f26c -s ours
am skip reason: Change-Id If5afd00334e8b09250df1ae97dec9285e39ad930 with SHA-1 7a4a65d680 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13122692
Change-Id: I98d0f38d6cb9ced5ef72419c543dd80c4084b730
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions