OSDN Git Service

Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev
authorJeff Tinker <jtinker@google.com>
Wed, 6 May 2015 17:22:33 +0000 (17:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 May 2015 17:22:35 +0000 (17:22 +0000)
commit26d955fd02e0bf3f76c50bceeba4b61598f1a8b2
treee288c5e03ea9bbcf9eeaf34542b980947aa0f250
parent71b0cb043f410d7f0a7852b2f297124fa9aed0e2
parentfc48bf78a2dbf9c145ddaba27dbb191a9ceaf18e
Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev
media/java/android/media/MediaCodec.java