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:
a76ba7b
76ddf41
)
am 76ddf411: Merge "Fix /proc/version parsing in Settings."
author
Elliott Hughes
<enh@google.com>
Tue, 11 Sep 2012 02:02:47 +0000
(19:02 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 11 Sep 2012 02:02:47 +0000
(19:02 -0700)
* commit '
76ddf4113ab73acfd3d6172a8965bffec2e7c60f
':
Fix /proc/version parsing in Settings.
1
2
src/com/android/settings/DeviceInfoSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/DeviceInfoSettings.java
Simple merge