| commit | e878cba760ece07e98dbea632871df16fe3a459f | [log] [tgz] |
|---|---|---|
| author | yuemingw <yuemingw@google.com> | Thu Jan 18 01:10:56 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 18 01:10:56 2018 +0000 |
| tree | e302f265872dc2728bfe6d2935f7aef8b9848995 | |
| parent | 88dec1f5005a0ea4e45dbb9293d0f4231ef0acc4 [diff] | |
| parent | ee4c9b7ac3afdeec59d66373c9d7e91e1865ff99 [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 Change-Id: I50afd290d13ce71f277cb23512c8a0afd197667c