OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
02cc815
85a215b
)
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
author
Jonathan Basseri
<misterikkit@google.com>
Wed, 2 Aug 2017 01:58:18 +0000
(
01:58
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 Aug 2017 01:58:18 +0000
(
01:58
+0000)
am:
85a215bae7
Change-Id: I30dddd90e5984519219865752f563a45962be593
1
2
telephony/java/android/telephony/TelephonyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/com/android/internal/telephony/ITelephony.aidl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc
telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge