tree 0151b983e76702987662913ecbddd3c00015d5cc
parent 07ab25720ea3181b25fc088f808ceb2b2cf57a6e
parent 00fdea7e14841c516dea884cd28bb5cfa0272c9d
author Selim Cinek <cinek@google.com> 1457663441 +0000
committer android-build-merger <android-build-merger@google.com> 1457663441 +0000

Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev am: 00e61f5a64
am: 00fdea7e14

* commit '00fdea7e14841c516dea884cd28bb5cfa0272c9d':
  Fixed a bug where text would still not animate
  Reseting user expansions when the shade is collapsed
  Added more spacing around notifications
  Fixed an bug with the notification backgrounds