diff options
| author | Xin Li <delphij@google.com> | 2017-12-07 07:36:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-07 07:36:49 +0000 |
| commit | b9fc83e0e9412548830f07e60c53d8072adb60de (patch) | |
| tree | 02faa969152d725a58053d9e639d94c40f3cc9ab /libMpegTPEnc/src/version | |
| parent | 990c02cb29758d3fbbe98d9c0b08359e44741dff (diff) | |
| parent | a3e0aa5f25908d92535e045bbde73c9a3d19adc7 (diff) | |
| download | fdk-aac-b9fc83e0e9412548830f07e60c53d8072adb60de.tar.gz fdk-aac-b9fc83e0e9412548830f07e60c53d8072adb60de.tar.bz2 fdk-aac-b9fc83e0e9412548830f07e60c53d8072adb60de.zip | |
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: a3e0aa5f25 -s ours
Change-Id: Ic4b4c468787b5a680e40d8bd915865cc4571ad92
Diffstat (limited to 'libMpegTPEnc/src/version')
0 files changed, 0 insertions, 0 deletions