tree 3265821c92f924e8871428a3c64e51b7a1f38bc4
parent c9f94b9c81a3db0c41a6cabff47053e7cb5e32bd
parent 89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b
author Eric Gilmore <egilmore@google.com> 1426002463 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426002463 +0000

am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs

* commit '89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b':
  Reworking geofencing training to new API and sample.