Merge to head

2012-01-02 19:03:07 -02:00
parent 1bd6e53f04
commit c3912042e9
125 changed files with 1852 additions and 3675 deletions
@@ -100,7 +100,7 @@ limitations under the License.
      </TableRow>

      <!-- Google Docs -->
-      <TableRow>
+      <TableRow android:id="@+id/send_google_docs_table_row">
        <ImageView
          android:layout_height="wrap_content"
          android:layout_width="wrap_content"