From: Chen Xu <fionaxu@google.com>
Date: Sat, 25 Feb 2017 01:17:45 +0000 (+0000)
Subject: Merge "move ACTION_CARRIER_SETUP intent to public api" am: d989558616
X-Git-Tag: android-x86-8.1-r1~475^2~22
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f5e1f92b897c1bf4412f957f7053e53f24f292c;p=android-x86%2Fpackages-apps-Settings.git

Merge "move ACTION_CARRIER_SETUP intent to public api" am: d989558616
am: fbf747bb76

Change-Id: I4fa43c07a96d070c209e6c71a7c5227958aef2ee
---

9f5e1f92b897c1bf4412f957f7053e53f24f292c