OSDN Git Service

Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
authorChristoph Studer <chstuder@google.com>
Thu, 8 Jan 2015 18:44:21 +0000 (18:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Jan 2015 18:44:24 +0000 (18:44 +0000)

Trivial merge