tree 6b09186cbcf45457529ed168f97a01382283788d
parent 6fa5540c36758119039d8991b02dc84eac0f2582
parent ab17a392f342ad1cbb991fde82bc5da05b37fd5e
author Android (Google) Code Review <android-gerrit@google.com> 1244054506 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1244054506 -0700

Merge change 2506 into donut

* changes:
  Integrate unsubmitted cupcake change 131139: 	CTS: add test cases for net.wifi.ScanResult, SupplicantState, WifiConfiguration, WifiInfo and WifiManager.     Added new tests as per mondrian comments. Cleaned code to get rid of eclipse warnings.