tree 720e8bc9e12cebedecb9f455785935409b4a11cd
parent 7c8405513675c47205a68c0644f6046eebefc5a3
parent e3c549fca27ad075deeb901df9701cf74d0a62fe
author Joe Malin <jmalin@google.com> 1368512948 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368512948 -0700

am e3c549fc: am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs

* commit 'e3c549fca27ad075deeb901df9701cf74d0a62fe':
  Android U: Making Apps Location-Aware