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)
commit7cdc5186741859c93e5cdc40265d7f574068e9ea
tree15fec9af86fe544a12a28e7cbe9a05d938f8aeaa
parentdd3945eca56488bd4947d00ac320670d1bce6580
parente5493808fdac21be3229397af6c98dc48b5c05e6
Merge "Notification settings update." into oc-dev
am: e5493808fd

Change-Id: I0d1b48669d85b6c1289c50a2a84aaa2dc292ea2a