tree fce07dc6c519063bdffcb6638b56bf5e42475d25
parent b4e1c8572aeee78a91f340c9607d3e934adae030
parent efb3726c226001149c92d48fa50da7031c231490
author Joe Malin <jmalin@google.com> 1368513287 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368513287 -0700

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

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