tree dfcb9ce860d13d75d712689f2ec58c8bd973958c
parent c87b54a5f8689780c24a18ce37268945ccfbcf99
parent 0315d12976218f10399982f403282e75e057badb
author yuemingw <yuemingw@google.com> 1516230859 +0000
committer android-build-merger <android-build-merger@google.com> 1516230859 +0000

Merge "Add URL_DPC, URL_FILTERED and URL_ENFORCE_MANAGED as constants." am: b760295764 am: 10f60a740f
am: 0315d12976

Change-Id: I0510b82c525d3dd6b577ece470ba3e82e6b7568e