OSDN Git Service

Merge "A test api to override carrier information" into pi-dev
authorChen Xu <fionaxu@google.com>
Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)
commit1a1b0608ca29192472425b99772278a742409aa1
tree5f774a9343aa9b62e3c1ce8fae92839220ab5aab
parentca0678117800284226a9c727b5b7ced2ddb5b8a3
parentb71c76036c5ab8e9127e40b0aeec5224357f5e31
Merge "A test api to override carrier information" into pi-dev
am: b71c76036c

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