| commit | 0cc563d102e285d694af6b582d5962bdc0311fb6 | [log] [tgz] |
|---|---|---|
| author | Conrad Chen <conradchen@google.com> | Wed Apr 05 02:25:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 05 02:25:31 2017 +0000 |
| tree | 0aea3bb7dd8641fcc5e97263d5c827afa5c6b5ee | |
| parent | 87440e9c8412a6e7f53e283082f5ac24dabd821e [diff] | |
| parent | 044eeecc1da059c7311c6444df4d6bba176cd2d5 [diff] |
Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev am: 044eeecc1d Change-Id: I4caef36d3cee02d8912cfa7e02681fb404007567