tree 474828aad0b7850b69e0ebee9d78dad93dfacd60
parent ca2bc75aac473b0b71f1e95c4527d862746b3efd
parent c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c
author Android (Google) Code Review <android-gerrit@google.com> 1246991126 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1246991126 -0700

am c1c44a56: Merge change 6363 into donut

Merge commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c'

* commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c':
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks