tree aee8594b43800f6d56f8b5f78062fced5af5b5a7
parent cb11f247390732b954d7f8b954dbc0f8816a2e4e
parent fbc9ea8046cad34b58ad727ce6045e3e15069502
author The Android Open Source Project <initial-contribution@android.com> 1349793102 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349793102 -0700

am fbc9ea80: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fbc9ea8046cad34b58ad727ce6045e3e15069502':
  Revert "Remove the Google specific location config."