am 55d16466: Merge "Fix UI of testing TDLS in Dev Tools app"

* commit '55d16466f60bcb7aac3cd345f54f6c8ff33ecadd':
  Fix UI of testing TDLS in Dev Tools app
This commit is contained in:
Yuhao Zheng
2014-01-09 21:36:12 +00:00
committed by Android Git Automerger

View File

@@ -219,6 +219,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/start_tdls" />
<Button android:id="@+id/stopTdls"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stop_tdls" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -227,10 +236,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minEms="10" />
<Button android:id="@+id/stopTdls"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stop_tdls" />
</LinearLayout>
<!-- divider line -->