am 0d70ee2c: Merge "Fix layout of standalone credential activity" into ub-mail-algol

* commit '0d70ee2cb9bc4bc1c515e69b00825972b2ced9d3':
  Fix layout of standalone credential activity
This commit is contained in:
Tony Mantler 2014-04-18 19:03:25 +00:00 committed by Android Git Automerger
commit abf887ff22

View File

@ -13,12 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/account_setup_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<include
@ -26,10 +27,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout android:id="@+id/button_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/account_settings_buttons" />
</FrameLayout>
</LinearLayout>
</ScrollView>