tree 20cc2f3bd081c3ba8e0ae409b1b142ecdf6bd31c
parent 403e22b97dc3763e55bf2fb9ab0d681e7ee6c828
parent 0d210f6395072db4a4c53d4cb8fac4a59a3965b4
author Jorim Jaggi <jjaggi@google.com> 1438125579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438125579 +0000

am 0d210f63: Animation for touch, wake and unlock

* commit '0d210f6395072db4a4c53d4cb8fac4a59a3965b4':
  Animation for touch, wake and unlock