tree 16aca97c94765e5bdab646a2ce5b89d9ee536f5e
parent c0177f877288752b3b0a6210a9c9cdac74865d43
parent 195ac875782051390b3730176c43fd94e39ec595
author Jeremy Joslin <jjoslin@google.com> 1483572017 +0000
committer android-build-merger <android-build-merger@google.com> 1483572017 +0000

Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f am: 84fd1e1120
am: 195ac87578

Change-Id: I1f6de46c521a232c1a218e3e6b50883ea6e150b0