| commit | 7993d6b343f2723872dac085756743630371454d | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Thu Jan 08 17:57:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 08 17:57:36 2015 +0000 |
| tree | 3577f12b2dee471ed021462b9ca731fb5e85a51d | |
| parent | 27a78b56e1cf9814971192883cb7d15c186465f7 [diff] | |
| parent | e03447548d1c56fa9875cac7d500f1012a6b5c26 [diff] |
am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev * commit 'e03447548d1c56fa9875cac7d500f1012a6b5c26': mark any copyrighted content as protected to disable capture