merge heads

2011-12-16 15:04:32 -08:00
parent f973ab8ac2
commit 4ce0809948
96 changed files with 2689 additions and 13446 deletions
@@ -49,6 +49,5 @@ limitations under the License.
  <string name="track_action_end">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
  <string name="track_action_save">android.intent.action.SAVE</string>
  <string name="track_action_start">com.google.android.apps.mytracks.START_NEW_TRACK</string>
-  <string name="unit_percent">%</string>
  <string name="value_unknown">-</string>
 </resources>