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