tree 7dc4e1df54ec5f903d372e5a96f89067f8e4e545
parent 0500297714a26c744304a323267d5d642f351326
parent 39069b6e82fa848608d56b4efc8f28785816fe27
author Joe Malin <jmalin@google.com> 1368513418 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368513418 -0700

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

* commit '39069b6e82fa848608d56b4efc8f28785816fe27':
  Android U: Making Apps Location-Aware