tree fb524173d0a6a5d7d6320b95af3f943c0221303b
parent dc48cbfd9bc332adcf8c771dd00827cb47088dfe
parent c6df994b665840689d6a23aaeb631199c82bb08c
author Roozbeh Pournader <roozbeh@google.com> 1491956796 +0000
committer android-build-merger <android-build-merger@google.com> 1491956796 +0000

Merge "Keep spans while transforming to uppercase" into oc-dev am: cd3f72d628
am: c6df994b66

Change-Id: I1503c0e669679d1e6c4d4b0ec3de3ca5303ef972