commit | e193b37a92515206241a25ede18fcab5678354fd | [log] [tgz] |
---|---|---|
author | Robert Shih <robertshih@google.com> | Thu Jun 16 18:00:29 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 18:00:29 2016 +0000 |
tree | 0c233ebcd4bea1f99db673ee501e1cfcfe3ee396 | |
parent | 6c79585c46c246b9b072d6f1d0c5babca46c8ac7 [diff] | |
parent | 2dd124980b4d90daae60127eec56a88bda7e417b [diff] |
Merge \\"HLS: allow audio/subtitles to appear after bitrate variants\\" into nyc-dev am: 37a9de26f6 am: 2dd124980b Change-Id: Ib3e190deeb1cdae97d167f61b44aa9d17bcc36c4