tree 90fd93508352da2f5aebc3ba4829ec492a8b4d22
parent 49a8822db9dcf2bc2b11a6a44179b361c1f8b86b
parent 711fb234051e80b61a9d635d3c6a4d102a931acd
author Fyodor Kupolov <fkupolov@google.com> 1436464920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436464920 +0000

am 711fb234: am 9d650f15: am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev

* commit '711fb234051e80b61a9d635d3c6a4d102a931acd':
  Check location permission/appop in getScanResults