| commit | 899ee0fe08bfa27b69840e6394deafbeb0c0d787 | [log] [tgz] |
|---|---|---|
| author | Conrad Chen <conradchen@google.com> | Wed Apr 05 02:29:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 05 02:29:56 2017 +0000 |
| tree | 505cc4c98030c14be7ead6adea3c18f27741ef3b | |
| parent | a728bd47b6ea0d0b5ccefc2c3639ac5dd14a2831 [diff] | |
| parent | 0cc563d102e285d694af6b582d5962bdc0311fb6 [diff] |
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev am: 044eeecc1d am: 0cc563d102 Change-Id: I48137a26231d6d12db687154e65ad339431da443