Merge changes from topic "am-3aaf8bb5fe054546b4807f8442dd0d01" into tm-dev
* changes: Merge changes from topic "cp-sc-dev-222473855" into sc-qpr1-dev am:a6aa828949am:bb6a4b6fb2[automerger skipped] [automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p:5b376bc9fdam:32bf2b1707-s ours am:31190222bc-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
5c2bb6dc14