| commit | 7fb346ec209eac91b9673840e10b3c9040dbef3f | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Jan 28 17:58:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 17:58:35 2015 +0000 |
| tree | fbd67eb5d1dbf6fbec89180d4759b09dbbe3ca86 | |
| parent | f2d5253bce5ef69cb6cb4da7697a228a47b55904 [diff] | |
| parent | 4b41400b60d57f23b16702540b9d50f98aeeffb7 [diff] |
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.