Merge "Revert "WifiManagerTest failure for open_network"" am: 084a3cdcab am: 0a77f0088d am: 5a2983e9c5 am: 9ae93f0adb am: 745ad4aad8
am: 0ee2f5f582

Change-Id: I56241b414445610f6c1960069957cbf19645194e
tree: eb953c9b663fc1c1613e3130eef042382a4cabe4
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg