merge heads

2011-11-15 16:43:45 -08:00
parent 999285fcbc
commit ae28dc01fe
99 changed files with 4799 additions and 10962 deletions
@@ -41,7 +41,7 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:textSize="16dip"
      android:textColor="#fff"
-      android:text="@string/status_wait_for_gps_fix"
+      android:text="@string/gps_wait_for_fix"
      android:layout_weight="0"/>
    </LinearLayout>
    <LinearLayout android:id="@+id/busypane"