| commit | 8a5f30e01e13caf3b4333a9a84ca457d61b380d7 | [log] [tgz] |
|---|---|---|
| author | yuemingw <yuemingw@google.com> | Thu Jan 18 01:23:59 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 18 01:23:59 2018 +0000 |
| tree | 6092056af9daec961849a70e073ca28d78bf93cf | |
| parent | 4c813dfa32037bcee9b757c965acf96cedc05e9a [diff] | |
| parent | e9c03fbb6cfb0996487e66f8480f220d0b155eb6 [diff] |
Merge "Allow URL_DPC and URL_ENFORCE_MANAGED to be called from Phone UID. Add URL_FILTERED_ID for Settings app to call." am: ee4c9b7ac3 am: e878cba760 am: e9c03fbb6c Change-Id: I92438bcb15ca12e04926c850633247bdce13199f