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:
3d0961c
dfb448d
)
am dfb448d2: am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if...
author
Andres Morales
<anmorales@google.com>
Wed, 7 Jan 2015 16:37:55 +0000
(16:37 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 7 Jan 2015 16:37:55 +0000
(16:37 +0000)
* commit '
dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c
':
Don't display Write NFC option if no NFC
1
2
src/com/android/settings/wifi/WifiSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/wifi/WifiSettings.java
Simple merge