tree ffc36970ff59484a2ca6fc360fa0fbc6dc24c314
parent 8f13a2ad9f68ddb10388e86104868311e5ee2e29
parent aa0acfc8761fc8802879f90511b904061a523ed2
author Dirk Dougherty <ddougherty@google.com> 1368628549 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368628549 -0700

am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge

* commit 'aa0acfc8761fc8802879f90511b904061a523ed2':
  Doc change: updates to location landing.