From: Jordan Liu <jminjie@google.com>
Date: Mon, 12 Feb 2018 20:19:37 +0000 (+0000)
Subject: Merge "Overload setTelephonyProperty without phone ID" am: f27242dbd6
X-Git-Tag: android-x86-9.0-r1~212^2^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de387f3298f6da26123a070b7bbf678176b21c0d;p=android-x86%2Fframeworks-base.git

Merge "Overload setTelephonyProperty without phone ID" am: f27242dbd6
am: 22189a729a

Change-Id: I9d8182751f5303258083e0b0d0825902d06225d1
---

de387f3298f6da26123a070b7bbf678176b21c0d