OSDN Git Service

Merge changes from topic "128616035"
authorXiangyu/Malcolm Chen <refuhoo@google.com>
Fri, 19 Apr 2019 17:14:32 +0000 (10:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Apr 2019 17:14:32 +0000 (10:14 -0700)
commit386d538f9deefab2b1ce27297e5439c07b9bfb81
treec4ff59a748a31513f68a2677db5867de715cde8c
parentab13f3096a369a9b9343b00870251e1b1465b8dd
parentdc4d14b37a93ed9067dde0b9085d7f48847bfad6
Merge changes from topic "128616035"
am: dc4d14b37a

Change-Id: I0f9807127cdd46079a969532bdeb121bf544921d
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl