| commit | e03447548d1c56fa9875cac7d500f1012a6b5c26 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Thu Jan 08 17:52:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 08 17:52:02 2015 +0000 |
| tree | afc168febb22623e47c447ed7d11a2c12f090475 | |
| parent | 78c02ddb6bf0d676160244a62c11dceb68301b73 [diff] | |
| parent | 468977f0fecaa983f712d9eacb80a73d3de807ae [diff] |
am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev * commit '468977f0fecaa983f712d9eacb80a73d3de807ae': mark any copyrighted content as protected to disable capture