summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2015-05-06 17:22:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-06 17:22:35 +0000
commit26d955fd02e0bf3f76c50bceeba4b61598f1a8b2 (patch)
treee288c5e03ea9bbcf9eeaf34542b980947aa0f250 /api
parent71b0cb043f410d7f0a7852b2f297124fa9aed0e2 (diff)
parentfc48bf78a2dbf9c145ddaba27dbb191a9ceaf18e (diff)
downloadframeworks_base-26d955fd02e0bf3f76c50bceeba4b61598f1a8b2.zip
frameworks_base-26d955fd02e0bf3f76c50bceeba4b61598f1a8b2.tar.gz
frameworks_base-26d955fd02e0bf3f76c50bceeba4b61598f1a8b2.tar.bz2
Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions