am 09d6ad37: am 2161b7cb: Merge "Fix invalid keyType translation in...
am 09d6ad37: am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev
* commit '09d6ad37':
Fix invalid keyType translation in MediaDrm.getKeyRequest