OSDN Git Service

Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
authorRoozbeh Pournader <roozbeh@google.com>
Sat, 6 May 2017 01:56:05 +0000 (01:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 6 May 2017 01:56:05 +0000 (01:56 +0000)
commit230e3beda5256ed4b45971ccc64765a9f9d22081
treed10c353fcccf8a0ced2156f0b477db9afe18e5af
parent0af6d8050ecba8425ea2817dbacac1cc6e92477b
parent4972daf9923f3f60538b67be690dcb7e72cf7f6b
Merge "Don't crash in TextUtil.concat() with paragraph spans" into oc-dev
am: 4972daf992

Change-Id: I8e24a7b278150bbb8b1e4b629f1d3473a732e7b9