tree 76ce3070c25c8c2e55209df87d109461dd99658e
parent 9a4b6b909487b61120fb085864533b70a9dabeb8
parent 7dda46e740250d753bb9d01e129e91695ab8cfe2
author Diego Perez <diegoperez@google.com> 1446647659 +0000
committer android-build-merger <android-build-merger@google.com> 1446647659 +0000

Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev
am: 7dda46e740

* commit '7dda46e740250d753bb9d01e129e91695ab8cfe2':
  Update StaticLayout_Delegate to use new nLoadHyphenator