summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/CameraModule.cpp
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2020-12-01 20:35:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-01 20:35:06 +0000
commit81c813d84df541e4d9a33b82f1b79a0815f6aadc (patch)
tree6f12d43d578922b0a12caa8d91613fe5be4eab1f /camera/common/1.0/default/CameraModule.cpp
parent238499ce7c6fc33548373cecc8d176e2968ad7b4 (diff)
parent8b2e90d952e8853e60dbd80019481ae3392851dc (diff)
[automerger skipped] Merge "Create getSystemSelectionChannel API" am: 4a5f4e5ab2 am: e92e5a06b6 am: 8b2e90d952 -s ours
am skip reason: Change-Id I6f3f70b7ff1b876ec98086431ed5c557875fca85 with SHA-1 e92c13a4d0 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1504053 Change-Id: I2f8f1238b04312c7171bf090f982d32da27532a1
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions