tree 05ea7a07022ee31d28c5b0c9cee388a8720727f3
parent ab94674c7005d875c8869f786c1b1666f90fd461
parent fc836f6684f6e142fe53dc16e1552ffd19bd95bc
author Jae Seo <jaeseo@google.com> 1409101697 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409101698 +0000

Merge "Revert "TIF: Temporarily disable permission check for parental controls"" into lmp-dev