tree 425606c43e89f2a82f0d2cfc6b85b8f03d340751
parent aa1483ec38043e17187d2f81464b957d840fae8a
parent a98b285b561a969e1849acd81babf74f852bd674
author Jack Yu <jackyu@google.com> 1551834740 -0800
committer android-build-merger <android-build-merger@google.com> 1551834740 -0800

Merge changes from topic "iwlan_api" am: 83181d80c8
am: a98b285b56

Change-Id: If17645f5461aeeebdcd4c76276571b8134d65dd9