OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
65e761f
386278a
)
am 386278a3: CDMA Settings additions
author
Chouting Zhang
<MichaelZhang@motorola.com>
Fri, 26 Jun 2009 05:06:36 +0000
(22:06 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Fri, 26 Jun 2009 05:06:36 +0000
(22:06 -0700)
Merge commit '
386278a338d740dce95b7fa1514662b0eb5683e4
'
* commit '
386278a338d740dce95b7fa1514662b0eb5683e4
':
CDMA Settings additions
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/SecuritySettings.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/deviceinfo/Status.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge
diff --cc
src/com/android/settings/SecuritySettings.java
Simple merge
diff --cc
src/com/android/settings/deviceinfo/Status.java
Simple merge
OSDN Git Service
