commit | 8ef09bc78750a72a371c801f896dd5dbbfaf524c | [log] [tgz] |
---|---|---|
author | Roozbeh Pournader <roozbeh@google.com> | Sat May 06 02:09:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat May 06 02:09:13 2017 +0000 |
tree | 3564594c1f1192bf81c6d0ed1b686debc0d35956 | |
parent | 285753339185ff2c509419288b30986c44b8d592 [diff] | |
parent | 230e3beda5256ed4b45971ccc64765a9f9d22081 [diff] |
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev am: 4972daf992 am: 230e3beda5 Change-Id: Iafd6e9cb942210cb422453570c8ae54d11d50356