summaryrefslogtreecommitdiffstats
path: root/services/java/com/android
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2013-04-15 13:17:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-15 13:17:41 -0700
commit4efc5b5cfb1b9885ff4294f6fa2de9ea74bd48b1 (patch)
tree5bf66266108d4c2d43b878506f70a831876fa57f /services/java/com/android
parent0ab49f1cc821d73630693d48b1a957e67889e72e (diff)
parent29b5e1701bdf06861d0eae4a3be05a7012c5e1c6 (diff)
downloadframeworks_base-4efc5b5cfb1b9885ff4294f6fa2de9ea74bd48b1.zip
frameworks_base-4efc5b5cfb1b9885ff4294f6fa2de9ea74bd48b1.tar.gz
frameworks_base-4efc5b5cfb1b9885ff4294f6fa2de9ea74bd48b1.tar.bz2
am 29b5e170: am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
* commit '29b5e1701bdf06861d0eae4a3be05a7012c5e1c6': Clarify how release of offline keys is handled in the MediaDrm API
Diffstat (limited to 'services/java/com/android')
0 files changed, 0 insertions, 0 deletions