diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-30 16:25:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 16:25:19 +0000 |
| commit | b7ca2709c3e079c54f5a8e517d602d313b96fde8 (patch) | |
| tree | f85004ae7079b47a74f49d6860bd8479c606045d /core/res | |
| parent | 2e52f82440a2f0e78e23d3138e31cfdd4e239563 (diff) | |
| parent | 0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3 (diff) | |
| download | frameworks_base-b7ca2709c3e079c54f5a8e517d602d313b96fde8.zip frameworks_base-b7ca2709c3e079c54f5a8e517d602d313b96fde8.tar.gz frameworks_base-b7ca2709c3e079c54f5a8e517d602d313b96fde8.tar.bz2 | |
am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3':
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 --> |