resolve merge conflicts of adc5927a693a03e8710ea4bb627f81855fe81ab2 to qt-dev-plus-aosp
am: 9d076a5b24

Change-Id: I7f752ae46ce7250f2fd6357badba66822d4d90ac
tree: 16c17827e4a299056727b41a8b53d0564d02418d
  1. cpp/
  2. doc/
  3. Android.bp
  4. CleanSpec.mk
  5. METADATA
  6. MODULE_LICENSE_APACHE2
  7. OWNERS
  8. README.android
  9. README.md
README.md

sfntly

This project is not developed any further. Only Bug fixes will be merged, but new features won't.

An actively maintained fork with new features is available at https://github.com/rillig/sfntly