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:
d4c6582
c4a1188
)
Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev
author
Ritesh Reddy
<riteshr@google.com>
Wed, 10 Feb 2016 18:04:38 +0000
(18:04 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 10 Feb 2016 18:04:38 +0000
(18:04 +0000)
am:
c4a1188afd
* commit '
c4a1188afd81b4b773e30ec184839bc1a82b355d
':
Enabling SoftAP Configuration Backup.
1
2
packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
patch
|
diff1
|
diff2
|
blob
|
history
wifi/java/android/net/wifi/WifiConfiguration.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
Simple merge
diff --cc
wifi/java/android/net/wifi/WifiConfiguration.java
Simple merge