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:
05c8a17
dd9d9fd
)
Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf
author
Xiangyu/Malcolm Chen
<refuhoo@google.com>
Tue, 29 Oct 2019 23:15:58 +0000
(16:15 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 29 Oct 2019 23:15:58 +0000
(16:15 -0700)
am:
dd9d9fde68
Change-Id: I48303451f2ad1eeab2513ac5994de2b97649d82b
1
2
packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/SubscriptionManager.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/TelephonyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
Simple merge
diff --cc
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java
Simple merge
diff --cc
telephony/java/android/telephony/SubscriptionManager.java
Simple merge
diff --cc
telephony/java/android/telephony/TelephonyManager.java
Simple merge