tree 40b4fd1f8eaa3a3633a0045744f494a5b463044f
parent c1c1a5e7d744d839b84e9d58be79902e91512e9b
parent 0710a7e6dea84b8fc57424381bf8eeca91c82c92
author Sunil Ravi <sunilravi@google.com> 1572457036 -0700
committer android-build-merger <android-build-merger@google.com> 1572457036 -0700

Merge "wifi: Change WIFI_FEATURE_XXX type from int to long" into qt-qpr1-dev
am: 0710a7e6de

Change-Id: I62aabcf014bc069353619dc98ed65cea7eb4fe09