tree 5762094cb725e26e59de77dd4ce2735fde6dbb28
parent 8424665e0e7678beeed01009e63f466adbc93929
parent 709aecb3ac3ab4f12c4234eabfaa54b4225940f9
author David Christie <dnchrist@google.com> 1410990230 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410990230 +0000

am ef52db95: am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev

* commit 'ef52db9536b0aef77a1543ca3a97a4ad43a70e9a':
  Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515