tree 505cc4c98030c14be7ead6adea3c18f27741ef3b
parent a728bd47b6ea0d0b5ccefc2c3639ac5dd14a2831
parent 0cc563d102e285d694af6b582d5962bdc0311fb6
author Conrad Chen <conradchen@google.com> 1491359396 +0000
committer android-build-merger <android-build-merger@google.com> 1491359396 +0000

Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev am: 044eeecc1d
am: 0cc563d102

Change-Id: I48137a26231d6d12db687154e65ad339431da443