OSDN Git Service

Merge "Add emergency broadcast to app & notification settings." into oc-dev
authorFan Zhang <zhfan@google.com>
Sat, 29 Apr 2017 06:57:43 +0000 (06:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 06:57:43 +0000 (06:57 +0000)
am: 908cad27ab

Change-Id: I743b5e63b42e65b8b405417d8e221077a452cc35


Trivial merge