| commit | c2809b7597e566ac4bbb1faa87656bffc426b59d | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Fri Jul 18 03:37:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 03:37:10 2014 +0000 |
| tree | 3d59977de6464d8c59fa6f909131dcf6397564f8 | |
| parent | 33003efada47102534ab813dd2d29433bd1a06e0 [diff] | |
| parent | 353bdd484f07e98db894143336aef60d6dc49ec1 [diff] |
am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev * commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175': TIF: Add TvParentalControlManager