tree b32dc27028b535b3123bb55f3c90b4a2b0913774
parent 0310f9aa21ed8714acbe56afea061596fb8f1ac4
parent b7e9922722f50dbf1911eb12e3ee8023c1450086
author Android (Google) Code Review <android-gerrit@google.com> 1246989724 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246989724 -0700

Merge change 6363 into donut

* changes:
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks