Merge \"Ensure pinned animation scaling is consistently applied.\" into nyc-dev

am: 3207d8f8a1

Change-Id: Id17634723fd1fce94cd62f29322a23c5f67dda89
This commit is contained in:
Robert Carr
2016-06-08 20:28:17 +00:00
committed by android-build-merger

View File

@@ -43,7 +43,7 @@
android:ellipsize="start"
android:inputType="textShortMessage|textAutoCorrect|textCapSentences"
android:textIsSelectable="true"
android:imeOptions="actionSend|flagNoExtractUi" />
android:imeOptions="actionNone|flagNoExtractUi" />
<FrameLayout
android:layout_width="wrap_content"