| commit | 353bdd484f07e98db894143336aef60d6dc49ec1 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Fri Jul 18 03:30:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 03:30:41 2014 +0000 |
| tree | 3e0ae9b020b7f1e01454c91c8e7b6d1f66109eda | |
| parent | e048698b4bac87c3a07c1904dd203660e63b76e0 [diff] | |
| parent | d2d179c3ca6e542cc682899addba22de33969fe4 [diff] |
am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev * commit 'b719bf5720ea501fa6324d866e49e65b59b1a182': TIF: Add TvParentalControlManager