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

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