tree 87293c5ffa6bd9f42b4700268b4e8cd3cb785a63
parent ec643782bc2e0771e50828d220326c633967d8cf
parent 80b417c731bde401a8e8221148c606dd59cdb5cf
author Selim Cinek <cinek@google.com> 1496869880 +0000
committer android-build-merger <android-build-merger@google.com> 1496869880 +0000

Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf936
am: 80b417c731

Change-Id: I37a02992a66fb0b9c1cceba926340690db014f87