tree 92be312eb05514c01c75cdb2574d68d4898bc6ab
parent 6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75
parent 3f36ba647d6bd49363ea9f025a8b1aeac0abeddd
author Craig Mautner <cmautner@google.com> 1415215819 +0000
committer android-build-merger <android-build-merger@google.com> 1415215819 +0000

Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
automerge: 3f36ba6

* commit '3f36ba647d6bd49363ea9f025a8b1aeac0abeddd':
  When keyguard exits use same anim for all windows