am 1758bc3c: Merge "Remove STOPSHIPs." into honeycomb

* commit '1758bc3c851bac5e6e55548ad0da3d66a90446b4':
  Remove STOPSHIPs.
This commit is contained in:
Andy Stadler 2011-01-26 21:49:29 -08:00 committed by Android Git Automerger
commit 230a5d1f04
2 changed files with 1 additions and 2 deletions

View File

@ -22,7 +22,6 @@
android:layout_height="64dip"
android:orientation="horizontal"
>
<!-- STOPSHIP default icon is not final -->
<ImageView
android:id="@+id/attachment_icon"
android:layout_width="64dip"

View File

@ -33,7 +33,7 @@
android:layout_height="64dip"
android:orientation="horizontal"
>
<!-- STOPSHIP Put icon here -->
<!-- TODO: The plan is to show a calendar icon here. -->
<ImageView
android:layout_width="64dip"
android:layout_height="64dip"