| commit | 4ad9b185d713720bc16b00255d8e29506720cf7a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Jan 08 21:17:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 08 21:17:24 2014 +0000 |
| tree | 1b90f1c2b85da478e77a54f9dc8e7ea9182753be | |
| parent | 9c63b5f7aa2bf637253d445bcc7a7aa191838d22 [diff] | |
| parent | 0ea36aaf4c9a038e1e2ca381db5250fc2a2fc992 [diff] |
am 0ea36aaf: am 89c399cb: Merge "address denials when playing protected content." * commit '0ea36aaf4c9a038e1e2ca381db5250fc2a2fc992': address denials when playing protected content.