OSDN Git Service

Merge "Notification settings update." into oc-dev
authorAlison Cichowlas <asc@google.com>
Mon, 19 Jun 2017 17:49:20 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 17:49:20 +0000 (17:49 +0000)
am: e5493808fd

Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a


Trivial merge