summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/CameraModule.cpp
diff options
context:
space:
mode:
authorJanis Danisevskis <jdanis@google.com>2019-06-27 18:43:08 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-27 18:43:08 -0700
commitc329ea5d18d2cb06307fa9e655ada53f5248eeef (patch)
tree57c575d8e3671062c3ee0f21dd61cfd8e23e48d5 /camera/common/1.0/default/CameraModule.cpp
parentb1d2df1ed0f1e1ec62ee464d3426682a7bc303bf (diff)
parentbcb3caa4ae74250f392701f15146a414bf7010b0 (diff)
[automerger skipped] Merge "Added HIDL based software implementation of gatekeeper" am: 7350a53137
am: bcb3caa4ae -s ours am skip reason: change_id I632aeb6677640c133ec1b79e72568840adbc0550 with SHA1 b1d2df1ed0 is in history Change-Id: Ia6ff8e9a9386344eb607eeb2ba96021c6d6e8dd9
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions