tree 4823492dbce8b490dec31f367dce295b224eca5b
parent 233d00553ca60480c20dd8d537aca2fedf91b8e7
parent dfea8785aebf72c368604183211a160cdb221163
author Etan Cohen <etancohen@google.com> 1490119264 +0000
committer android-build-merger <android-build-merger@google.com> 1490119264 +0000

Merge "Wifi-Hal: Fix Nan capabilities mismatch"
am: dfea8785ae

Change-Id: If931d718043b0972d46a53c7d3d3b69f9299ecd8