| commit | 32479c9f7a004d2c1daeac015684529b0158f8a4 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Thu Jan 08 18:03:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 08 18:03:45 2015 +0000 |
| tree | d0f6cb7cb08b29506090a4cf44e4c723f903fb16 | |
| parent | 2326ed104477a80c850eb3cef6a7039f1585a69d [diff] | |
| parent | 7993d6b343f2723872dac085756743630371454d [diff] |
am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev * commit '7993d6b343f2723872dac085756743630371454d': mark any copyrighted content as protected to disable capture