merge heads

2011-12-16 15:04:32 -08:00
parent f973ab8ac2
commit 4ce0809948
96 changed files with 2689 additions and 13446 deletions
@@ -21,7 +21,8 @@ limitations under the License.
  <TableLayout
    android:layout_height="wrap_content"
    android:layout_width="wrap_content"
-    android:paddingBottom="2dp"
+    android:padding="2dp"
+    android:shrinkColumns="0"
    android:stretchColumns="1">
    <TableRow style="@style/AboutTableRow">
      <ImageView