tree b28286c57e98cf5c2ab7aa38ca42cd3625118808
parent 13f9f3edb37d3f7287b13a0c4ec9e482baa0b155
parent aa7f55942a82b95b695ab2b2bfa02d28f5d21fcd
author Jeremy Joslin <jjoslin@google.com> 1491430966 +0000
committer android-build-merger <android-build-merger@google.com> 1491430966 +0000

Merge "Restore @VisibleForTesting on NetworkScorerAppManager." into oc-dev am: 4734737329
am: aa7f55942a

Change-Id: I773c2b525f0cc660d418e3165a4af3d688c6b27b