From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Fri, 20 Jan 2017 19:55:15 +0000 (+0000)
Subject: Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
X-Git-Tag: android-x86-8.1-r1~377^2^2~25^2~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4fc77792c171f4e696b55e196582439cb1683eb;p=android-x86%2Fframeworks-native.git

Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers"
---

c4fc77792c171f4e696b55e196582439cb1683eb