tree 1c9f5af4ae245178677daf01de64b1453a044e5f
parent 77c2432574095a5c7f6f778498caa7e68277c2df
parent 35f75624958bc061764c7cc71843ca7ea60c0666
author Deepanshu Gupta <deepanshu@google.com> 1447966828 +0000
committer android-build-merger <android-build-merger@google.com> 1447966828 +0000

Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
am: 35f7562495

* commit '35f75624958bc061764c7cc71843ca7ea60c0666':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""