Merge commit '3f3ed24' into stage-aosp-master

am: e9b6029153

Change-Id: Ife13a5773b542f9af317296addb70d753e64f69b
This commit is contained in:
Roshan Pius
2016-09-02 07:26:21 +00:00
committed by android-build-merger

View File

@@ -1266,6 +1266,7 @@ public class WifiConfiguration implements Parcelable {
}
mTemporarilyDisabledTimestamp = source.mTemporarilyDisabledTimestamp;
mNetworkSelectionBSSID = source.mNetworkSelectionBSSID;
setSeenInLastQualifiedNetworkSelection(source.getSeenInLastQualifiedNetworkSelection());
setCandidate(source.getCandidate());
setCandidateScore(source.getCandidateScore());
setConnectChoice(source.getConnectChoice());