Automated merge with http://mytracks.googlecode.com/hg/

2011-09-21 16:17:01 -07:00
parent 6ab1f6158a
commit 4f9b6535fb
6 changed files with 62 additions and 15 deletions
@@ -49,4 +49,5 @@ limitations under the License.

  <!-- Intent actions -->
  <string name="save_intent_action">android.intent.action.SAVE</string>
+  <string name="open_settings_screen">android.intent.action.settings.OPEN</string>
 </resources>