tree fbd67eb5d1dbf6fbec89180d4759b09dbbe3ca86
parent f2d5253bce5ef69cb6cb4da7697a228a47b55904
parent 4b41400b60d57f23b16702540b9d50f98aeeffb7
author John Spurlock <jspurlock@google.com> 1422467915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422467915 +0000

am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev

* commit '4b41400b60d57f23b16702540b9d50f98aeeffb7':
  Default "pickup peforms proximity check" to false.