diff options
| author | Winson Chung <winsonc@google.com> | 2014-09-19 00:03:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 00:03:54 +0000 |
| commit | aab1a058dbeba8ec375790844d2ae5a99539084c (patch) | |
| tree | 5f997e924845cc8c58393b8361ffee1b8e64f1f6 /packages/SystemUI/res | |
| parent | 879c239d8ab78ad374dac5227b2a702d642b435b (diff) | |
| parent | f7dd908171a12f6a3f91575ac9fd1ef8ba7fefe6 (diff) | |
| download | frameworks_base-aab1a058dbeba8ec375790844d2ae5a99539084c.zip frameworks_base-aab1a058dbeba8ec375790844d2ae5a99539084c.tar.gz frameworks_base-aab1a058dbeba8ec375790844d2ae5a99539084c.tar.bz2 | |
am 5c744b1b: Merge "Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)" into lmp-dev
* commit '5c744b1b01156c37f894619fbe70741435d7ed53':
Handling broader set of exceptions when startingActivity from Recents. (Bug 17481968)
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 0445fe8..e9a1acf 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -670,6 +670,8 @@ <string name="recents_lock_to_app_button_label">lock to app</string> <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] --> <string name="recents_search_bar_label">search</string> + <!-- Recents: Launch error string. [CHAR LIMIT=NONE] --> + <string name="recents_launch_error_message">Could not start <xliff:g id="app" example="Calendar">%s</xliff:g>.</string> <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] --> |