From: Youhan Wang <youhanw@google.com>
Date: Fri, 9 Dec 2016 22:24:30 +0000 (+0000)
Subject: Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
X-Git-Tag: android-x86-8.1-r1~475^2~113
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=97069369450fcddf50b18ed948635e2e7e53a445;p=android-x86%2Fpackages-apps-Settings.git

Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
am: f6b8321654

Change-Id: Icc7bbc20943c224bfb6cc0131480cf394b1e1124
---

97069369450fcddf50b18ed948635e2e7e53a445