tree 453bb32657d56dfe52a0b034e6caec83fd96c1ee
parent 1743988cd7647af8c64c961d4ca5e9d4b4b7bc00
parent a8431e8c37df24564114dc6840a710fd45b39091
author Alan Viverette <alanv@google.com> 1439322905 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439322905 +0000

am a8431e8c: am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev

* commit 'a8431e8c37df24564114dc6840a710fd45b39091':
  Ensure ripple mask is drawn at correct position