summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/CameraModule.cpp
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2021-02-19 03:07:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-19 03:07:08 +0000
commitb5ae2a072d1010120a5b85fda0524d3474528e79 (patch)
tree4ddd26ba1a5f8ddc4da24648b871176888fe0747 /camera/common/1.0/default/CameraModule.cpp
parent390d4faacf53de32df25aa20233f24329181bcd5 (diff)
parent6a0a1a18d535c516600e24531f47f58e93ced54a (diff)
[automerger skipped] Merge "Allow getSystemSelectionChannels to return specifiers" am: c3325707a5 am: 3e8439d5ec am: 6a0a1a18d5 -s ours
am skip reason: Change-Id I574e897c0fdb57cad1a3655c34d43f0d080de9ae with SHA-1 bb4c2fdc02 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595753 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5a4e9d0f4761ee7bc31abbdaaf8e97b8cd845077
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions