diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-11 13:31:28 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-11 13:31:28 -0700 |
| commit | 00c406364e7bb6b9191e928b1d1e4be9a7bb0960 (patch) | |
| tree | de071e3e72477517b9131acf3defef51c06dde57 /tests/res/values | |
| parent | 97ece591a65f5848e527d45501d586e613f379bf (diff) | |
| parent | b2dd90383bae9f3ca0a99b59d3f5992e7fd5ad48 (diff) | |
| download | packages_apps_Settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.zip packages_apps_Settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.tar.gz packages_apps_Settings-00c406364e7bb6b9191e928b1d1e4be9a7bb0960.tar.bz2 | |
merge from open-source master
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
Diffstat (limited to 'tests/res/values')
| -rw-r--r-- | tests/res/values/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml index 00de425..9fb98f9 100644 --- a/tests/res/values/strings.xml +++ b/tests/res/values/strings.xml @@ -22,4 +22,10 @@ <string name="discoverable">Discoverable</string> <string name="start_scan">Start scan</string> <string name="stop_scan">Stop scan</string> + <string name="operator_hello">Hello Operator!</string> + <string name="operator_settings_title">Operator</string> + <string name="operator_settings_summary">Operator hook that can be used to start activity of choice</string> + <string name="manufacturer_hello">Hello Manufacturer!</string> + <string name="manufacturer_settings_title">Manufacturer</string> + <string name="manufacturer_settings_summary">Manufacturer hook that can be used to start activity of choice</string> </resources> |