tree 419d47feeaaeda14d5211907ff7f18b6717c3613
parent 40b771b5600e3d8741b35120a5e058eb0f4e19c5
parent 5dc1c303637aa20434cc633133c52755a979cc65
author Alan Viverette <alanv@google.com> 1402492077 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402492077 +0000

am 5dc1c303: Merge "Ripple tint is now color" into lmp-preview-dev

* commit '5dc1c303637aa20434cc633133c52755a979cc65':
  Ripple tint is now color