commit | ddf83bb028b1e93c19d982e0514877296b3b3b6e | [log] [tgz] |
---|---|---|
author | John W. Bruce <juce@google.com> | Fri Mar 23 04:33:54 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 23 04:33:54 2018 +0000 |
tree | e7e4e303fedda5ec6817c4db10ed3e262b536dcf | |
parent | 3c8d7ba7edb819a0c47fcb838ed43c541eae1bdc [diff] | |
parent | 889da15d94086e4b9ce09a99ed2089148b58d72d [diff] |
Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev am: 6ab6a9d433 am: 889da15d94 Change-Id: I9ef9a16a6175840f8f72800400bcdc6d2ec9684e