| commit | d84bdafb9f91c8f317a259c9f0e83bd807b81627 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Thu Sep 03 22:04:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 22:04:12 2015 +0000 |
| tree | 7edf0b5b7d637c36469e96ae1a3e22773b41bfb3 | |
| parent | c575b041bd050e5838a0ce78b661538aa9f4138e [diff] | |
| parent | d15869a1526d080f850b9264ebf156db3899562b [diff] |
am d15869a1: (-s ours) Merge "TV: Add parental control tests to CtsVerifier DO NOT MERGE" into lmp-sprout-dev * commit 'd15869a1526d080f850b9264ebf156db3899562b': TV: Add parental control tests to CtsVerifier DO NOT MERGE