tree 36459b6a4d70ec0b67c6843a5f95d8b77d12db0c
parent ba526c47bb0de254a4e866ee4dbddf1b9c4f6d71
parent a6d5dabde2485a9285e09389c23c51498db80aaa
author Mady Mellor <madym@google.com> 1464886861 +0000
committer android-build-merger <android-build-merger@google.com> 1464886861 +0000

Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 am: ece7cd7120" into nyc-mr1-dev-plus-aosp
am: a6d5dabde2

* commit 'a6d5dabde2485a9285e09389c23c51498db80aaa':

Change-Id: I57ad86e98f00b19e2580f03873a19a83d35e965d