commit | 28f33edd74058a498cdfc84001ee2173895cba06 | [log] [tgz] |
---|---|---|
author | Jae Seo <jaeseo@google.com> | Wed Aug 27 01:08:08 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 27 01:08:08 2014 +0000 |
tree | 9c69b67e7a5ac2c2ab6012bc4902320f0f3a0645 | |
parent | 5d05aa72ee869d63828305e86a784b30b795f411 [diff] | |
parent | 99c10998ff754242ba0c9cdde5de11dc373457ed [diff] |
Merge "Revert "Temporarily disable parental controls permission check"" into lmp-dev