OSDN Git Service

Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
authorDaniel U <uda@google.com>
Fri, 8 Apr 2016 15:51:13 +0000 (15:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Apr 2016 15:51:13 +0000 (15:51 +0000)
commit957ec6aee4ad8dfbde5cedb9791effdce1ca9825
treee39b1c85d0a8792aad6dc0d4b37cdea4784bc649
parent186d97bbab34d51a88321da2556eda551ea0ddd3
parent9f4ad67fad34331aecbdabd4a0193038fa0e9f79
Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev
am: 9f4ad67

* commit '9f4ad67fad34331aecbdabd4a0193038fa0e9f79':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I80943b49439532bdb676825ac9a8ee5bc7088b11