OSDN Git Service

Merge "Revert "Use new netlink attribute for scan result timestamp" am: ecb6bb205f...
authorNingyuan Wang <nywang@google.com>
Tue, 20 Jun 2017 23:37:39 +0000 (23:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 23:37:39 +0000 (23:37 +0000)
am: 0636688388

Change-Id: I769405ce2cfb8b35c5b049dac92e054a4b6bb453


Trivial merge