OSDN Git Service

Merge "Consolidate notification settings." into oc-dev am: 6adf04c741
authorJulia Reynolds <juliacr@google.com>
Tue, 18 Apr 2017 02:03:01 +0000 (02:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 02:03:01 +0000 (02:03 +0000)
am: bcaa8ecb24

Change-Id: Id632a07d66080acb4368c1789ce829ff8898b378

1  2 
AndroidManifest.xml

Simple merge