am c4fe2942: Merge "Fix misplaced xml namespace"

* commit 'c4fe29425c2a09b5c4de4477228be12cba29895b':
  Fix misplaced xml namespace
main
Kurt Partridge 2013-05-24 06:55:43 -07:00 committed by Android Git Automerger
commit e1f8635937
1 changed files with 1 additions and 2 deletions

View File

@ -18,9 +18,8 @@
want a dialog, but it must be its own activity so we can launch the soft want a dialog, but it must be its own activity so we can launch the soft
keyboard on it. A regular dialog will not work since it would be launched from keyboard on it. A regular dialog will not work since it would be launched from
the IME. --> the IME. -->
<ScrollView> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"