OSDN Git Service

resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Mon, 15 Dec 2014 16:27:39 +0000 (16:27 +0000)
committerNarayan Kamath <narayan@google.com>
Mon, 15 Dec 2014 16:27:39 +0000 (16:27 +0000)
commit62d35b65f236e494520d7ca480e502c79f5f4fe3
tree32120d1e7d6750937e23851fcb60a60f8fd06723
parent755005bddf4e476dda9404d0ab3ee007b7ebd554
parentfa893886418a077c94ac7280a756b207fc821583
resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp

Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
src/com/android/settings/RadioInfo.java
src/com/android/settings/wifi/WifiStatusTest.java