| commit | e9c03fbb6cfb0996487e66f8480f220d0b155eb6 | [log] [tgz] |
|---|---|---|
| author | yuemingw <yuemingw@google.com> | Thu Jan 18 01:16:33 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 18 01:16:33 2018 +0000 |
| tree | cf945d4b35ee39011185d9330c63bb9ff32dd9a5 | |
| parent | 78871519e59004dbe51b1ddac8af5953e07bb13d [diff] | |
| parent | e878cba760ece07e98dbea632871df16fe3a459f [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 Change-Id: I630e439b4164f369899ea1004609eb31449dce9e