tree 9413f9fdca17f6714c1ee51f7014331de77c8fdc
parent c376fb681cad6009eba82903e9cd2499c8cd8933
parent 0564779e76a2ba86ddfcd54da1491d6ae30c7cef
author Roshan Pius <rpius@google.com> 1574690707 -0800
committer android-build-merger <android-build-merger@google.com> 1574690707 -0800

Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module" am: 5b57190f08
am: 0564779e76

Change-Id: I04580ad32eefb2ce4c8df8f1037b8457238c30eb