tree d41b2a1e0c173e63fcbe18920bb6a8ed9e9cdf67
parent d9e93752f6775b4f4a9200979d4aa8876b66e7d8
parent f16bb771910b551a36650c35c52772ad71b5eeed
author Jeremy Joslin <jjoslin@google.com> 1501793997 +0000
committer android-build-merger <android-build-merger@google.com> 1501793997 +0000

Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev am: 589ba65d91
am: f16bb77191

Change-Id: I611a839c304bd8ec3bba09c730e9878f55554f01