Merge heads

2012-06-05 16:51:53 +08:00
parent 953bd8b908
commit 04cc524bbb
131 changed files with 4865 additions and 692 deletions
@@ -43,10 +43,10 @@ limitations under the License.
        android:text="@string/help_location_precision_answer"
        style="@style/HelpAnswer" />
      <TextView
-        android:text="@string/help_gps_fix_question"
+        android:text="@string/help_gps_signal_question"
        style="@style/HelpQuestion" />
      <TextView
-        android:text="@string/help_gps_fix_answer"
+        android:text="@string/help_gps_signal_answer"
        style="@style/HelpAnswer" />
      <TextView
        android:text="@string/help_data_connection_question"