tree f8cfc7f0f24ad02d2431d256bd65754a2e81c19c
parent 6309c526e57454da6d0c5de93f2894c2ded3a1b1
parent 2595f146fecd3828231c6611362cce65acd9afb6
author Grace Kloba <klobag@google.com> 1245707966 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1245707966 -0700

am 2595f146: Use the new Secure settings for location. Also added the code to invoke the consent dialog.

Merge commit '2595f146fecd3828231c6611362cce65acd9afb6'

* commit '2595f146fecd3828231c6611362cce65acd9afb6':
  Use the new Secure settings for location. Also added the code to invoke the consent dialog.