OSDN Git Service

am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
authorJae Seo <jaeseo@google.com>
Fri, 18 Jul 2014 03:26:23 +0000 (03:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Jul 2014 03:26:23 +0000 (03:26 +0000)
* commit '3245f3d76cc92899091f113e701a32a7eb819591':
  TIF: Add TvParentalControlManager


Trivial merge