| commit | d2d179c3ca6e542cc682899addba22de33969fe4 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Fri Jul 18 03:26:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 03:26:23 2014 +0000 |
| tree | ac342f79c57efddf9d0ac4f0e69fec264f7c6b3b | |
| parent | 99aa4d3ec373c567acf0cf434f38fcb335fe10e2 [diff] | |
| parent | 54a463498316594ba7e0567db5d4f541a7a1e827 [diff] |
am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev * commit '3245f3d76cc92899091f113e701a32a7eb819591': TIF: Add TvParentalControlManager