am 995c8fc5: am 26d955fd: Merge "Clarify wording of MediaCrypto exception...
am 995c8fc5: am 26d955fd: Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev
* commit '995c8fc5':
Clarify wording of MediaCrypto exception "ERROR_NO_KEY"