tree bae1881ef1c616b4bcb962f915a3ccc7804fbbc2
parent 30aee7fccbbcbdd09ca9393636316813e222ba62
parent 67b0ac719a87ba52c849a6cf055ef235f230dd6e
author Sarah Maddox <sarahmaddox@google.com> 1415923358 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415923358 +0000

am 67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs

* commit '67b0ac719a87ba52c849a6cf055ef235f230dd6e':
  docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.