summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/CameraModule.cpp
diff options
context:
space:
mode:
authorMichael Butler <butlermichael@google.com>2021-02-24 02:47:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-24 02:47:00 +0000
commit86a314e6ec0b83636ef9694ba36854086ca5333e (patch)
tree2c9518cba74595afbf0edb650adacb7b36c2d677 /camera/common/1.0/default/CameraModule.cpp
parentb1bffe46ec5994254967af18f596f0c0e47d7c17 (diff)
parent4b4a5e62da9f6b5d3624e912c74ec182dff0ae02 (diff)
Merge changes from topic "nnapi-numberOfConsumers" am: 65de531533 am: 734a2b401d am: 4b4a5e62da
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600094 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1654e80efdc6e61cfeea53b785e74b74c1fd4bc
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions