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:
cf4d62f
0c2a585
)
Merge "Add strings and carrier config needed network service." am: a3ccb8d854
author
Malcolm Chen
<refuhoo@google.com>
Tue, 6 Feb 2018 23:14:06 +0000
(23:14 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 6 Feb 2018 23:14:06 +0000
(23:14 +0000)
am:
0c2a5852f5
Change-Id: I51a4792545c4fb06611681ef2f4ca1183f2fd61a
1
2
core/res/AndroidManifest.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/config.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/CarrierConfigManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/res/AndroidManifest.xml
Simple merge
diff --cc
core/res/res/values/config.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
telephony/java/android/telephony/CarrierConfigManager.java
Simple merge