tree 3deef7d02be4343944e546a5075f81c394d34f51
parent dcf0cc679b8bd21fb9c6c8ad4d8034a60aa2af54
parent 60fd2b2de286f3543cf9db9550db9083211ca5ea
author Jim Miller <jaggies@google.com> 1340065537 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340065537 -0700

am 60fd2b2d: am ddbc85cb: Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev

* commit '60fd2b2de286f3543cf9db9550db9083211ca5ea':
  Fix 6683092: tune GlowPadView wave animation