tree 1cc1b1c36a563902703564c78e8d4de7167d19da
parent 40faf8dc65e1745a7e64314f6e06aa5a4292e8e6
parent cf770f41ad9fdeadb5d5000071a6f7ee8818f212
author Michael Wright <michaelwr@google.com> 1376595071 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376595071 -0700

am cf770f41: Merge "Bound touch and tool axes lengths below at 0" into klp-dev

* commit 'cf770f41ad9fdeadb5d5000071a6f7ee8818f212':
  Bound touch and tool axes lengths below at 0