OSDN Git Service

Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev am: 6ab6a9d433
authorJohn W. Bruce <juce@google.com>
Fri, 23 Mar 2018 04:33:54 +0000 (04:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Mar 2018 04:33:54 +0000 (04:33 +0000)
commitddf83bb028b1e93c19d982e0514877296b3b3b6e
treee7e4e303fedda5ec6817c4db10ed3e262b536dcf
parent3c8d7ba7edb819a0c47fcb838ed43c541eae1bdc
parent889da15d94086e4b9ce09a99ed2089148b58d72d
Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev am: 6ab6a9d433
am: 889da15d94

Change-Id: I9ef9a16a6175840f8f72800400bcdc6d2ec9684e