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

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