tree 109ae17e0fe38980913f7474b310691a5d5de2f1
parent 9902b3bc8d11fd3ef33644315a87436b7a48c78b
parent 4cc1553c931e26efad17cc1a1b74b0a0d880f301
author Filip Gruszczynski <gruszczy@google.com> 1442269028 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442269028 +0000

am 4cc1553c: am 0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied.

* commit '4cc1553c931e26efad17cc1a1b74b0a0d880f301':
  Don't animate burn-in return when it wasn't applied.