OSDN Git Service

Merge "TIF: protect PARENTAL_CONTROLS_ENABLED_CHANGED broadcast" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 5 Apr 2017 02:20:20 +0000 (02:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Apr 2017 02:20:25 +0000 (02:20 +0000)

Trivial merge