tree 89ae09aadb71370d67063e1e04861ff2b4f48b7a
parent 89d42cabcd8b2395474f30fc2d3ecf42a7c03681
parent 7b2fba2f4a78fb42f42268fb899884b8fe4c5e1d
author Dirk Dougherty <ddougherty@google.com> 1368628786 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368628786 -0700

am 7b2fba2f: am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit '7b2fba2f4a78fb42f42268fb899884b8fe4c5e1d':
  Doc change: updates to location landing.