diff options
| author | Andy Hung <hunga@google.com> | 2020-01-30 12:41:03 -0800 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2020-01-30 12:50:05 -0800 |
| commit | cfaa13af324c312ef58ffcb1523190bbc7a647cd (patch) | |
| tree | d4f8a725401bc4d20c8fd9b12f8c27815a69cc44 /services/mediatranscoding/MediaTranscodingService.cpp | |
| parent | 2496ffbc450029ee9ec26980a101e71352b4f635 (diff) | |
| parent | 29622fe971325dd6929f2f3a4fe2c7fcf736c03c (diff) | |
Merge commit '29622fe971325dd6929f2f3a4fe2c7fcf736c03c' into manual_merge_29622fe971325dd6929f2f3a4fe2c7fcf736c03c
Manual merge by recursive strategy with no conflicts (automerger failed).
Test: build and sanity
Bug: None
Change-Id: I9e2d9466d26fde80a95f0c7a2ac336c1a23c3bc5
Diffstat (limited to 'services/mediatranscoding/MediaTranscodingService.cpp')
0 files changed, 0 insertions, 0 deletions