tree 84d312d6d74019028e10c779de7538693a9fe29b
parent 1e4dfe2844f6b454c56410dd224fb0d930fdfd8c
author Polina Bondarenko <pbond@google.com> 1484316825 +0100
committer Polina Bondarenko <pbond@google.com> 1484775893 +0100

Enable FEATURE_TELEPHONY_CARRIERLOCK for marlin/sailfish.

Bug: 33480084
Test: cts

Merged-In: I4fceac6a4e97f9f014be7079eebeca309e4f44b2

Change-Id: I4fceac6a4e97f9f014be7079eebeca309e4f44b2