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)
commitae112c8a4697b3701f6f09b348a4c2e2240ef408
tree513ced6e574c590551298a6eb73e78df6d556ff8
parent586b1e4cee4f05b55547211d5317abcc39a0338f
parent908cad27abbac486d2e8e2f1c364ae6b4a5453c2
Merge "Add emergency broadcast to app & notification settings." into oc-dev
am: 908cad27ab

Change-Id: I743b5e63b42e65b8b405417d8e221077a452cc35