summaryrefslogtreecommitdiff
path: root/services/mediatranscoding/MediaTranscodingService.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-30 23:01:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-30 23:01:07 +0000
commit05c49e907fd4872defdce3b15b8a6be08c177284 (patch)
tree6aa72fda62eae77ba06c584e1e53869ee71c96a6 /services/mediatranscoding/MediaTranscodingService.cpp
parent0b890e627dc50e9f8bcb0870db37c0c310d1cdb2 (diff)
parent16dd56fa2dcbadb7144592a65804dbfbbc46b1c8 (diff)
Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752 am: 9279fa954a am: 16dd56fa2d
Change-Id: Ibe7d0626f3c93cabc933ae1b8fbc678c3052b19e
Diffstat (limited to 'services/mediatranscoding/MediaTranscodingService.cpp')
0 files changed, 0 insertions, 0 deletions