tree 767360f1e3772860650f54ad51dbffe453fddf8f
parent 7cd49c6c3a2678510a278f28514c73dcbaae8957
parent 9d4b7963399045395799dcb7df5d8c84d9b12884
author Christoph Studer <chstuder@google.com> 1420742993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420742993 +0000

am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev

* commit '9d4b7963399045395799dcb7df5d8c84d9b12884':
  NoMan: Cancel previous instance of ignored notification