tree 82e25633ec5db8b53040632ad8a2d8b7d2568a67
parent b496fd8765d754631ba5528ffc0dfbbae9146344
parent c30beb79e7d319376ff9f39cddab1bdefb0cbcce
author Roshan Pius <rpius@google.com> 1575482584 -0800
committer android-build-merger <android-build-merger@google.com> 1575482584 -0800

Merge "WifiManager: Add missing field to getConfiguredNetworks() doc" am: 846c0fe038
am: c30beb79e7

Change-Id: I318718984f1c3d90b5f39d1adc2986fcba9265b2