tree 0f7ab9199d29d7cd195b43ff3b4634d8a69e583e
parent 6d23b1419fb3cf26025484d5de142de873e5cd9f
parent 558f10307c65e5c0a3e0e11a4abca4a083f751dc
author Shirish Kalele <kalele@google.com> 1438980942 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438980942 +0000

am 558f1030: am 74f93f9a: am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev

* commit '558f10307c65e5c0a3e0e11a4abca4a083f751dc':
  Fix check for caller being the active network scorer