Commit 61cd0534 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge changes Ie410c1ae,I8dbab7e3 into jb-mr2-dev 

* changes:
  Added CTS test to complete MediaDrm offline API change clarification
  Adding CTS test for secure stop APIs
parents 1842963d cc49e3b0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment