tree 31e45d62f448a7a1f90907f8ca35394b67c2c1a6
parent 668504731ee79e4b0248a868fa229546823ae020
parent 938055b12209028be0ff36d0eb81892c443f0b60
author Siyamed Sinir <siyamed@google.com> 1462311486 +0000
committer android-build-merger <android-build-merger@google.com> 1462311486 +0000

Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6dd
am: 938055b122

* commit '938055b12209028be0ff36d0eb81892c443f0b60':

Change-Id: I236a44a16b2876bceb0a6a00768053fc1e7a4b73