summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/CameraModule.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-11-21 03:49:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-21 03:49:15 +0000
commitcfbee58a1a36952e8a297c968c2a43329ec7b492 (patch)
treee5fb234355e137fc6b862a053c6b72ee631d560f /camera/common/1.0/default/CameraModule.cpp
parent9f5533e805a7d278e5f4a777ebbb0e0d2406c34f (diff)
parent3464a8b7124304d27fa74ddbb44cf1fe2155f9ab (diff)
[automerger skipped] Merge "HAL changes for ThermalMitigation API." am: 6be52d5b34 am: 2c33220ae7 am: 3464a8b712 -s ours
am skip reason: Change-Id I914993a6e80305732564e0507ca6a74b1c296439 with SHA-1 62fd344711 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1507840 Change-Id: I0d438829c7266b510ae37bf57b3ce51905b7e619
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions