tree f33a204030b18d00bcbaea7598408ef87304efbc
parent 0bcf7f54e807d4aeb58bf4ec9a2831c11c6b000d
parent cd70c8736919a2750777ba5c7f655c650584fcf4
author Joe Malin <jmalin@google.com> 1368512833 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368512833 -0700

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

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