tree 68b768daaa83fece317e0e1a2169e9439eda28e6
parent e422b0b29f9fc61ffca1578503a06b8d924a462a
parent bc243a962702cfa6fa9cdc56356e996a77acd307
author Selim Cinek <cinek@google.com> 1475183376 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1475183379 +0000

Merge changes I703ea278,I2c517d0a into nyc-mr1-dev

* changes:
  Fixed a few bugs regarding big notification groups
  Fixed a bug where the scroller would stop tracking