| commit | 4b41400b60d57f23b16702540b9d50f98aeeffb7 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Jan 28 17:52:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 17:52:48 2015 +0000 |
| tree | 6eb1da1e274124e43839486398900c9101fddcc8 | |
| parent | fdb8dff54cf9327089e5ee4d5bf461ef42020fcd [diff] | |
| parent | e2f4ab930fa4526cf989624356051b99008c23a6 [diff] |
am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev * commit 'e2f4ab930fa4526cf989624356051b99008c23a6': Default "pickup peforms proximity check" to false.