OSDN Git Service

Merge "Notifications settings updates to match spec: - change badge language & remove...
authorAlison Cichowlas <asc@google.com>
Thu, 11 May 2017 00:19:46 +0000 (00:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 00:19:46 +0000 (00:19 +0000)
am: b9a2d6a6e3

Change-Id: I20c3fc6dc977145a9f9938c470ea69a393061000


Trivial merge