Merge "Revert "Temporarily disable parental controls permission check"" into lmp-dev
tree: 9c69b67e7a5ac2c2ab6012bc4902320f0f3a0645
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml