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:
20fd6bd
c5461c4
)
Merge "Modified MultiSim APIs"
author
Michele Berionne
<mberionne@google.com>
Thu, 21 Mar 2019 19:07:24 +0000
(12:07 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Mar 2019 19:07:24 +0000
(12:07 -0700)
am:
c5461c4490
Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/system-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
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
api/current.txt
Simple merge
diff --cc
api/system-current.txt
Simple merge
diff --cc
telephony/java/android/telephony/TelephonyManager.java
Simple merge
diff --cc
telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge