tree 48f5d283e0dd7fb6e793746427954b201fcc47fa
parent 0430ce908510f501276e7f588ba5c34d33a9d27a
parent 7086cd5c75073b75cd4a7d61aaa9f0529450e4e5
author Dianne Hackborn <hackbod@android.com> 1335308902 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335308902 -0700

am 7086cd5c: am 5600deb7: am d26a8b73: am cda8329e: Merge "Distance max set incorrectly"

* commit '7086cd5c75073b75cd4a7d61aaa9f0529450e4e5':
  Distance max set incorrectly