tree 2783ae3fd9c014ec7be3f5d6eb8fa20eccbc2947
parent e77c8c6486bb8dcbcaed1d49463903a8570afc47
parent b1161c83f9ee661947261fd678da261ca3a33acb
author Roshan Pius <rpius@google.com> 1474065889 +0000
committer android-build-merger <android-build-merger@google.com> 1474065889 +0000

Merge "WifiScanner: Change hidden/PNO scan params"
am: b1161c83f9

Change-Id: I2d517f18f1cd9e412467785316c8b67e1a1a400d