diff options
| author | Tony Wickham <twickham@google.com> | 2017-05-19 12:17:02 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-05-19 12:17:02 -0700 |
| commit | 3720c69322210e2e196ad93bf856eadc3a956177 (patch) | |
| tree | 986c9d06cb25078fca44fdda8fd01604bb83e3ba /res/values/config.xml | |
| parent | 4de0ddc4f16ea7d89f20cac68380f3095fd83f91 (diff) | |
| parent | 8af16760dcb367dc7568ae3736b797cd2c8406c1 (diff) | |
| download | android_packages_apps_Trebuchet-3720c69322210e2e196ad93bf856eadc3a956177.tar.gz android_packages_apps_Trebuchet-3720c69322210e2e196ad93bf856eadc3a956177.tar.bz2 android_packages_apps_Trebuchet-3720c69322210e2e196ad93bf856eadc3a956177.zip | |
resolve merge conflicts of 8af16760d to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4cdfeebd09be58270c249429104d91dc9a31b49c
Diffstat (limited to 'res/values/config.xml')
| -rw-r--r-- | res/values/config.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index ace1d7e5f..8f2590abc 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -138,4 +138,5 @@ <item type="id" name="action_move_screen_forwards" /> <item type="id" name="action_resize" /> <item type="id" name="action_deep_shortcuts" /> + <item type="id" name="action_dismiss_notification" /> </resources> |