OSDN Git Service

Merge "Developer setting to enable notification channel warnings" into oc-dev am...
authorGeoffrey Pitsch <gpitsch@google.com>
Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)
commit4ea625820063d6f6021a5aee50fb0390fc1b072d
tree8d055ae271cfac916889eab2b779a4c88f3c90d5
parent5ab93ad700b06cde50d052cdb70af4dad78bebae
parent984dad4ac654e4cd54b5f3378a8a8ab225a30c00
Merge "Developer setting to enable notification channel warnings" into oc-dev am: 77bb0aaf96
am: 984dad4ac6

Change-Id: Ica82b112388bd3f3f0a1e2e0281b8c1036d64934
res/xml/development_prefs.xml
src/com/android/settings/development/DevelopmentSettings.java