Google Git
Sign in
android / platform / external / freetype / e4a6cc6f5bc957b9e282e863832d441c74d71bfa
commite4a6cc6f5bc957b9e282e863832d441c74d71bfa[log] [tgz]
authorXin Li <delphij@google.com>Fri Oct 06 11:07:19 2023 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Oct 06 11:07:19 2023 +0000
treef42a82395735950100a850c43032f2fb42639c6f
parentd5ad1ef20b53fc63369cd16349eb8998883a1605 [diff]
parent4e7cbecbd6018e31be667f473900224acf904b0c [diff]
[automerger skipped] Merge "Merge Android 14" into main am: 8697ac6648 -s ours am: 4c9f1bc92e -s ours am: 695c0c6e9d -s ours am: 4e7cbecbd6 -s ours

am skip reason: Merged-In Ie65ff6cbe7b779071d0c072501bcc271b7dc211d with SHA-1 5a90cf9c25 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2776318

Change-Id: Ib84c3dbc2fd592b578c3aa5da81dd3e46425b86a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: f42a82395735950100a850c43032f2fb42639c6f
  1. builds/
  2. devel/
  3. devel-teeui/
  4. docs/
  5. include/
  6. objs/
  7. src/
  8. subprojects/
  9. tests/
  10. .clang-format
  11. .gitignore
  12. .gitlab-ci.yml
  13. .mailmap
  14. Android.bp
  15. autogen.sh
  16. CleanSpec.mk
  17. CMakeLists.txt
  18. configure
  19. generate_notice.py
  20. libft2.map.txt
  21. LICENSE
  22. LICENSE.TXT
  23. LICENSE_APACHE2.TXT
  24. LICENSE_BSD_3_CLAUSE.TXT
  25. LICENSE_FSFAP.TXT
  26. LICENSE_MIT.TXT
  27. LICENSE_MIT_MODERN_VARIANT.TXT
  28. Makefile
  29. meson.build
  30. meson_options.txt
  31. METADATA
  32. MODULE_LICENSE_BSD_LIKE
  33. modules.cfg
  34. NOTICE
  35. OWNERS
  36. README
  37. README.android
  38. README.git
  39. TEST_MAPPING
  40. vms_make.com