tree ede126cf4e5712a31eca2e9d7e9189bb1566f838
parent ad97ca8188f246c9c902f42749b93fd67b93aee2
parent 39d47c7c709cd2417f8a0a7849ed6da8eb83caa3
author Eric Gilmore <egilmore@google.com> 1425670792 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425670792 +0000

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

* commit '39d47c7c709cd2417f8a0a7849ed6da8eb83caa3':
  Reworking geofencing training to new API and sample.