tree aeb4fae90ffd9a65a40c48309ff184fb0b6a8d1c
parent 756ac8e0737499c638cdf7979435eae7fd4c48a5
parent 2268bcf00645f2aa8df1cb15e6a6c4097e9b9454
author Selim Cinek <cinek@google.com> 1457662814 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457662815 +0000

Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev

* changes:
  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