OSDN Git Service

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

Change-Id: I43f0d112d2a5bbd57995e42d50f5877e905dfe20


Trivial merge