Merge "Add getters and private constructor" into jb-mr2-dev

author Irfan Sheriff <isheriff@google.com>

Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)

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

Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)
author Irfan Sheriff <isheriff@google.com>
Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)
diff --cc api/current.txt
Simple merge
diff --cc wifi/java/android/net/wifi/WifiEnterpriseConfig.java
Simple merge
author	Irfan Sheriff <isheriff@google.com>
	Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 19 Apr 2013 17:56:34 +0000 (17:56 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
wifi/java/android/net/wifi/WifiEnterpriseConfig.java	patch \|	diff1 \|	diff2 \|	blob \| history