tree 3409a319b231317c63b0b3477c161c76822bcb92
parent 0232d0f400400568410e1f85e7aba28bcd2ac183
parent 8f090032dd4f8f8908f338cc73bb840b788377f2
author Android Chromium Automerger <chromium-automerger@android> 1385079749 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1385079749 +0000

Merge third_party/sfntly/cpp/src from https://chromium.googlesource.com/external/sfntly/cpp/src.git at 8f090032dd4f8f8908f338cc73bb840b788377f2

This commit was generated by merge_from_chromium.py.

Change-Id: I6bab7aea653201e125014f7b81504acf7b846300