summaryrefslogtreecommitdiff
path: root/services/mediatranscoding/MediaTranscodingService.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 17:28:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 17:28:38 +0000
commitf7f77d870012d4c0d3e95b6dd94aa2d8465076b7 (patch)
tree9a9e083386e2b0504c6f27f0ae437df60b6f515a /services/mediatranscoding/MediaTranscodingService.cpp
parentd31f7b328d266a6590270946f177b1f35d21662f (diff)
parent11060fbe35bc72e641ed9f905a8a34210b4b4e51 (diff)
[automerger skipped] Merge "Add stubs so you can use libaaudio from an APEX" am: 2bb0404ebc am: 11060fbe35 -s ours
am skip reason: Change-Id I1350a8e110f5ffc6e1f8316c46a36b8a50b73fb6 with SHA-1 99c47ff165 is in history Change-Id: If8a8cbaafef20d8a75d5a3826b8bfb103f944790
Diffstat (limited to 'services/mediatranscoding/MediaTranscodingService.cpp')
0 files changed, 0 insertions, 0 deletions