diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-30 15:58:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 15:58:27 +0000 |
| commit | 1642e354ed10bc606f403ac6f529392f3f25dd2d (patch) | |
| tree | c2b1af20e65ffbacfaa93001d527252413feb3b4 /core/res | |
| parent | c98070a46168c14e54899bfca69889154e3a565d (diff) | |
| parent | 8f72b4037022c4f860caafa296e2ac309bde177f (diff) | |
| download | frameworks_base-1642e354ed10bc606f403ac6f529392f3f25dd2d.zip frameworks_base-1642e354ed10bc606f403ac6f529392f3f25dd2d.tar.gz frameworks_base-1642e354ed10bc606f403ac6f529392f3f25dd2d.tar.bz2 | |
am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '8f72b4037022c4f860caafa296e2ac309bde177f':
Zen: New event condition data model.
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/config.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 56eab2c..6f60188 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2054,6 +2054,7 @@ <string-array translatable="false" name="config_system_condition_providers"> <item>countdown</item> <item>schedule</item> + <item>event</item> </string-array> <!-- Priority repeat caller threshold, in minutes --> |