tree 614bec7b453624c0b80f856ced058057806667ab
parent ba165af05586de06b90b81e6619f458720d79618
parent febc9b5e5e29d3b08f13f72f05bc950e207ebb63
author Alan Viverette <alanv@google.com> 1402492076 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402492076 +0000

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

* commit 'febc9b5e5e29d3b08f13f72f05bc950e207ebb63':
  Ripple tint is now color