From: goneil <goneil@google.com>
Date: Thu, 8 Feb 2018 02:21:01 +0000 (+0000)
Subject: Merge "Make TelephonyManager#getNai() public"
X-Git-Tag: android-x86-9.0-r1~222^2~4^2~4^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b731583b7adfc328fad21e58af171bd8abb2699b;p=android-x86%2Fframeworks-base.git

Merge "Make TelephonyManager#getNai() public"
am: 4c8fa81d17

Change-Id: Ie219d338df42cf4593545180691759426616ade4
---

b731583b7adfc328fad21e58af171bd8abb2699b