tree 30b1072cca615a248f6df126e30869927202619f
parent 97a97c72fda372bf925f883ed6c242fc15b88877
parent cd3f72d62835f86be5997f88a83122718eca6d2e
author Roozbeh Pournader <roozbeh@google.com> 1491956066 +0000
committer android-build-merger <android-build-merger@google.com> 1491956066 +0000

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

Change-Id: Ie93ae0764c46883c46f5d4f5a8996d57aa143b7e