tree 9c3ad88722dc9551e17c20b5b4f6defdbe3f1cc3
parent 49e6cece96a8c0c27b0fd8236fa1afcdbaa96277
parent 2e0d1cb45834e98e029b4ba4fd6b636b28c12269
author David Christie <dnchrist@google.com> 1410991169 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410991169 +0000

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

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