tree aee8594b43800f6d56f8b5f78062fced5af5b5a7
parent 78704aac8d52ec8bdc48451e987dae1eafb141d0
parent 4effdb7fd0a9bd84bea9191844a83b2b0b362823
author Jeff Hamilton <jham@android.com> 1349461783 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349461783 -0700

am 4effdb7f: am 1cf3fea6: am 01d53167: Revert "Remove the Google specific location config."

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