tree 8e80456a7160c35ad10841ec0224ff9e7bd74e11
parent a0032e39904a3a762f2c00a69c10667b6d2a5c62
parent 3ae14f0eadc07d4a4b8ca95d1ad2d1d47406ed6d
author Etan Cohen <etancohen@google.com> 1490372113 +0000
committer android-build-merger <android-build-merger@google.com> 1490372113 +0000

Merge "[WIFI] Restore initialization code" am: 8f4416aabb
am: 3ae14f0ead

Change-Id: I96f5c77e7f9ee3b84f4a6cf7973638d3d4bba68d