tree f680e285ad378f37c815891cde617bc0208cf33e
parent 451b9f7f4659e540dc114712d6fb2cb3222e70aa
parent ac0d22f4cebed591953e61e17fe2550d77265184
author Selim Cinek <cinek@google.com> 1485911512 +0000
committer android-build-merger <android-build-merger@google.com> 1485911512 +0000

Merge "Fixed an issue where heads-upped notifications would stay" into nyc-mr2-dev am: e89a950b8b
am: ac0d22f4ce  -s ours

Change-Id: Iee2e3512eb816ec9865038ffc918b698d38c30fc