[automerger skipped] [automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p: 5b376bc9fd am: df70a82494 -s ours am: 380a1c8bf1 -s ours am: 44f4936c41 -s ours am: e1f8d126e7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18321041 Change-Id: Ie4e01cc1f37177890fcc638e78df42c973087656 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: