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

* commit '2b8f3734c485870d5f27fc9010932aaf83b7ccfc':
  Android U: Making Apps Location-Aware