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:
10c3747
cfa8591
)
Merge "Revert "TelephonyManager System APIs process"" into pi-dev
author
Amit Mahajan
<amitmahajan@google.com>
Tue, 20 Mar 2018 21:27:58 +0000
(21:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Mar 2018 21:27:58 +0000
(21:27 +0000)
am:
cfa8591779
Change-Id: I9cea061688397e4d407167f8f7b680385c5592cf
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