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 20:51:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-30 20:51:08 +0000
commit16dd56fa2dcbadb7144592a65804dbfbbc46b1c8 (patch)
tree789e1d5526165a4aadfcc55a47114228b04c1405 /services/mediatranscoding/MediaTranscodingService.cpp
parent29622fe971325dd6929f2f3a4fe2c7fcf736c03c (diff)
parent9279fa954ac08e851618b660ab426bbf7a3c6477 (diff)
Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752 am: 9279fa954a
Change-Id: I2930c10685eef466491626e7cfed1fbda8720081
Diffstat (limited to 'services/mediatranscoding/MediaTranscodingService.cpp')
0 files changed, 0 insertions, 0 deletions