tree bc1b481ac8e6d63c7aaae5aad9312981d3bc8dff
parent d0607035e33585d1b494a73348bdf9ff9339e82d
parent 402401e666b0b5068ebcb0e45d0ed9c06dd4674e
author Jeff Sharkey <jsharkey@android.com> 1380933373 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380933373 -0700

am 402401e6: am 2dcba613: am 5b491d63: Merge "Custom pressed states, fixed column sizes." into klp-dev

* commit '402401e666b0b5068ebcb0e45d0ed9c06dd4674e':
  Custom pressed states, fixed column sizes.