merge heads

2012-04-06 10:54:22 -07:00
parent 79fde1c118
commit f5085b208d
319 changed files with 6180 additions and 5754 deletions
@@ -28,7 +28,7 @@ limitations under the License.
    android:layout_width="fill_parent"
    android:text="@string/search_no_results"
    android:textColor="@android:color/white"
-    android:textSize="20dip"
+    android:textSize="20dp"
    android:textStyle="bold"
    android:visibility="gone" />
 </LinearLayout>