tree 1282845feebf645a5efa5e71533637a53fa77638
parent 9be07e8c914438a4918a272fc8944141964c8d62
parent 30870013927905645c1afb08a336df2c3e4e7d47
author Jeff Hamilton <jham@android.com> 1350589283 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350589283 -0700

am 30870013: Merge "Change the name of the location config value." into jb-mr1-dev

* commit '30870013927905645c1afb08a336df2c3e4e7d47':
  Change the name of the location config value.