tree 4fca2f35cc6ae3e736f5657efcb242dda0a25f2d
parent 6f3546796a381a17e4e8e6dbf869ca75abfab696
parent a718943d422876488f8723bfe6f35f352ffcb586
author Mindy Pereira <mindyp@google.com> 1400711886 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400711886 +0000

am a718943d: Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev

* commit 'a718943d422876488f8723bfe6f35f352ffcb586':
  Make a smaller cliff for dismissing cards