OSDN Git Service

Merge "Notification settings update." into oc-dr1-dev am: cd9224a058
authorAlison Cichowlas <asc@google.com>
Mon, 19 Jun 2017 15:15:31 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 15:15:31 +0000 (15:15 +0000)
am: eeda4ae540

Change-Id: I3139992a754e69e8ef1e2da858403a0e3b3f3b79


Trivial merge