tree 06c82aa503ade540a1c93cf2ea65717d97f0260a
parent 6b9371ceef5c86c9633ac30aa507b45125aeea7f
parent 09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98
author Mady Mellor <madym@google.com> 1464884093 +0000
committer android-build-merger <android-build-merger@google.com> 1464884093 +0000

Merge "Parent notifications should always be normal notification color" into nyc-dev
am: 09ca7e73c0

* commit '09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
  Parent notifications should always be normal notification color

Change-Id: I581aed7e42200d5b78a5e7ac396c76eed883450c