tree e7e4e303fedda5ec6817c4db10ed3e262b536dcf
parent 3c8d7ba7edb819a0c47fcb838ed43c541eae1bdc
parent 889da15d94086e4b9ce09a99ed2089148b58d72d
author John W. Bruce <juce@google.com> 1521779634 +0000
committer android-build-merger <android-build-merger@google.com> 1521779634 +0000

Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev am: 6ab6a9d433
am: 889da15d94

Change-Id: I9ef9a16a6175840f8f72800400bcdc6d2ec9684e