tree 42495bf169797237d95d1ff436c91facf6a3d3bf
parent c8484abbbde02171023f159491ca342186ae095c
parent 7bd2feda9e146c90c8720d8aa213ebcd9c30430c
author Filip Gruszczynski <gruszczy@google.com> 1426625098 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426625098 +0000

am 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev

* commit '7bd2feda9e146c90c8720d8aa213ebcd9c30430c':
  Add animation to zeroing burn in protection.