merge heads

This commit is contained in:
Jimmy Shih
2012-04-06 10:54:22 -07:00
parent 79fde1c118
commit f5085b208d
319 changed files with 6180 additions and 5754 deletions
@@ -26,14 +26,14 @@ limitations under the License.
android:layout_height="wrap_content"
android:background="@drawable/list_bar"
android:layout_weight="0"
android:padding="3dip">
android:padding="3dp">
<TextView android:id="@+id/message"
android:layout_width="fill_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="16dip"
android:textSize="16dp"
android:textColor="#fff"
android:text="@string/marker_list_pick_one"
android:layout_weight="0"/>
android:layout_weight="1"/>
</LinearLayout>
<ListView android:id="@android:id/list"