tree 41c2a1c2d4d8db8654d53b637b8d62d6e43d17a1
parent d9d5cd32ab6c72a75b4789acd780228ac54669d3
parent 6847953955502caa0bd0ba255d879a89aeccbd24
author Sergei Vasilinetc <sergeyv@google.com> 1458594725 +0000
committer android-build-merger <android-build-merger@google.com> 1458594725 +0000

Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev
am: 6847953

* commit '6847953955502caa0bd0ba255d879a89aeccbd24':
  Revert "Move text logic from jni to hwui level"