Merge to head (non-trivial merge)

2011-06-14 20:42:57 -03:00
parent a41994cb41 4044185ab3
commit 9ee053e4f9
17 changed files with 227 additions and 99 deletions
@@ -39,6 +39,9 @@ limitations under the License.
  <string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
  <string name="sendtogoogle_google_mymaps_url">maps.google.com</string>
  <string name="sendtogoogle_google_docs_url">docs.google.com</string>
+  
+  <!-- ID for Google Analytics -->
+  <string name="google_analytics_id">UA-7222692-2</string>

  <!-- Intent actions -->
  <string name="save_intent_action">android.intent.action.SAVE</string>