tree edf594ccc56a37562490e131670aa2e60a5bae3d
parent 3533ea3bbb0c71f1b7e7ebcb442ac4f3230bceeb
parent cd6ffc82ef248dc0260f2b5fb615d0ae727664b9
author Scott Main <smain@google.com> 1354578531 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354578531 -0800

am cd6ffc82: am a06c2941: docs: revisions to GPS Setup page w/ note about emulator

* commit 'cd6ffc82ef248dc0260f2b5fb615d0ae727664b9':
  docs: revisions to GPS Setup page w/ note about emulator