tree 29c639f2335c7245fba5b346850c7cf26367faa9
parent ade8896d12cb0c250c24e38e81848f5fb9032310
parent 01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0
author Alan Newberger <alann@google.com> 1436574869 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436574869 +0000

am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit '01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0':
  Shorten location startup dialog string