Merge "fix null pointer crash" into mnc-dev

author Vinit Deshpande <vinitd@google.com>

Thu, 14 May 2015 03:39:45 +0000 (03:39 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 14 May 2015 03:40:04 +0000 (03:40 +0000)
author Vinit Deshpande <vinitd@google.com>
Thu, 14 May 2015 03:39:45 +0000 (03:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 14 May 2015 03:40:04 +0000 (03:40 +0000)
diff --cc wifi/java/android/net/wifi/WifiManager.java
Simple merge
author	Vinit Deshpande <vinitd@google.com>
	Thu, 14 May 2015 03:39:45 +0000 (03:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 14 May 2015 03:40:04 +0000 (03:40 +0000)