tree 1bf54e65c1b2dc82bc5df0d94313ff5073401120
parent 8679758cee03c35fa0fcea761b95c2817a1b292f
parent ce13838ade484c79bc438a405f42ac17467e4956
author Amin Shaikh <ashaikh@google.com> 1484006070 +0000
committer android-build-merger <android-build-merger@google.com> 1484006070 +0000

Merge "Expose fields in WifiConfiguration." am: 1ea4180c3a
am: ce13838ade

Change-Id: Ia391a1b115646ad0409c5b52fee664d42901dd18