| commit | 8cbfad3934d36be7165e6d9c0f96a9ce9a2be114 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Jan 28 18:04:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 18:04:56 2015 +0000 |
| tree | 7ceed3dc59e33e8291cc28c02b5681d46f88b41d | |
| parent | 293465a75c1346ae1c0e32570344fb9423177eea [diff] | |
| parent | 7fb346ec209eac91b9673840e10b3c9040dbef3f [diff] |
am 7fb346ec: am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev * commit '7fb346ec209eac91b9673840e10b3c9040dbef3f': Default "pickup peforms proximity check" to false.