summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-30 00:27:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-30 00:27:21 +0000
commitee4bd11c4cfc7a2a78ace23da42c1de59545f3bf (patch)
tree6f6993817715953d27844796cb1c2152ab241e58 /media
parent4010631b49f0629d1052742bf9e7f973162c8b71 (diff)
parent8fa0eecc4fa569fe89273ddb3234f03bf1c567ec (diff)
downloadframeworks_base-ee4bd11c4cfc7a2a78ace23da42c1de59545f3bf.zip
frameworks_base-ee4bd11c4cfc7a2a78ace23da42c1de59545f3bf.tar.gz
frameworks_base-ee4bd11c4cfc7a2a78ace23da42c1de59545f3bf.tar.bz2
am 8fa0eecc: am 789d9dc7: am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
* commit '8fa0eecc4fa569fe89273ddb3234f03bf1c567ec': Add KeyPermanentlyInvalidatedException.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions