tree 67be139f9f69f5bdb7513b875ccc028b17e2b9e0
parent 7a5409fe634cea7a6340cb0beaf8b122b7f426cb
parent 7988ef9c4da50f007fde71a121f89e6b9796c69e
author Selim Cinek <cinek@google.com> 1418321057 +0000
committer android-build-merger <android-build-merger@google.com> 1418321057 +0000

Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev automerge: 372eb38
automerge: 7988ef9

* commit '7988ef9c4da50f007fde71a121f89e6b9796c69e':
  Fixed a bug where the empty shade and dismiss views would animate