tree df598be673d7168a77d40f21dbde91db6b39cfdd
parent 25d7b965af2e47c63d0fe795cb2d2b248ee88bab
parent 428b997e553fc80e1dc49f54df87e632572ea7d2
author Peter Qiu <zqiu@google.com> 1499882467 +0000
committer android-build-merger <android-build-merger@google.com> 1499882467 +0000

Merge "WifiMetrics: add Passpoint related metrics" into oc-dr1-dev am: b07f49dd92
am: 428b997e55

Change-Id: I9f17b94e0e9494a5ecb20bd3d0cfe1c4d95f5cc8