Commit Graph

Select branches

Hide Pull Requests

cm-10.1

cm-10.2

cm-11.0

cm-12.1

cm-13.0

cm-14.1

cm-9.1.0

gb-release-7.2

gingerbread

gingerbread-release

ics

ics-release

jellybean

jellybean-stable

lineage-15.1

lineage-16.0

lineage-17.1

lineage-18.1

lineage-19.1

mr1.1-staging

shipping/cm-11.0

stable/cm-10.2

stable/cm-11.0

stable/cm-11.0-XNF8Y

stable/cm-11.0-XNF9X

stable/cm-11.0-XNG2S

stable/cm-11.0-XNG3C

stable/cm-12.1-YOG4P

stable/cm-12.1-YOG7D

staging/cm-12.0

staging/cm-12.0-caf

staging/cm-14.0

swallow-7.1

cm-10.1-M1

cm-10.1-M2

cm-10.1-M3

cm-10.1.0

cm-10.1.0-RC1

cm-10.1.0-RC2

cm-10.1.0-RC3

cm-10.1.0-RC4

cm-10.1.0-RC5

cm-10.1.1

cm-10.1.2

cm-10.1.3

cm-10.1.3-RC1

cm-10.1.3-RC2

cm-10.2-M1

cm-10.2.0

cm-10.2.1

cm-11.0-XNPH05Q-bacon-5229c4ef56

cm-11.0-XNPH05Q-tomato-9828f8e9cc

cm-11.0-XNPH22R-bacon-03d77315ea

cm-11.0-XNPH25R-bacon-d22b777afa

cm-11.0-XNPH30O-bacon-4f280f505a

cm-11.0-XNPH33R-bacon-3628510d76

cm-11.0-XNPH44S-bacon-5fa8c79c0b

cm-7.1.0

Mono Color

• 7a651191a0 xorg 编译依赖 swallow-7.1 kuailexs 2024-12-25 00:13:55 +08:00
• 782dfc7d3c Merge tag 'android-security-11.0.0_r70' of https://android.googlesource.com/platform/external/freetype into staging/lineage-18.1_merge_android-security-11.0.0_r70 lineage-18.1 Kevin F. Haggerty 2023-08-07 19:14:25 -06:00
• e73609cb5c Cherrypick following three changes lineage-19.1 Seigo Nonaka 2023-05-02 10:01:38 +09:00
• d3eab1b435 Merge tag 'android-security-11.0.0_r69' of https://android.googlesource.com/platform/external/freetype into staging/lineage-18.1_merge_android-security-11.0.0_r69 Kevin F. Haggerty 2023-07-07 08:14:45 -06:00
• ba8533fb9f DO NOT MERGE - Cherry-pick two upstream changes Werner Lemberg 2022-03-19 06:40:17 +01:00
• 4500edb720 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23077068'] into security-aosp-rvc-release. Android Build Coastguard Worker 2023-06-08 20:34:44 +00:00
• f616d60dc1 Cherrypick following three changes Seigo Nonaka 2023-05-02 10:01:38 +09:00
• 6b18876fa6 Merge cherrypicks of ['googleplex-android-review.googlesource.com/22327786'] into security-aosp-rvc-release. Android Build Coastguard Worker 2023-05-11 18:39:27 +00:00
• 9fc4728129 DO NOT MERGE - Cherry-pick two upstream changes Werner Lemberg 2022-03-19 06:40:17 +01:00
• f9102744be Merge "Replace llndk_library with llndk clause in cc_library" am: 59719b5837 am: 207bbdaa8e am: 2e525035c5 Colin Cross 2021-04-23 00:41:44 +00:00
• 2e525035c5 Merge "Replace llndk_library with llndk clause in cc_library" am: 59719b5837 am: 207bbdaa8e Colin Cross 2021-04-23 00:19:55 +00:00
• 207bbdaa8e Merge "Replace llndk_library with llndk clause in cc_library" am: 59719b5837 Colin Cross 2021-04-23 00:01:19 +00:00
• 59719b5837 Merge "Replace llndk_library with llndk clause in cc_library" Colin Cross 2021-04-22 23:33:28 +00:00
• cda5f9fc12 Merge "Make libfreetype2 available to vendor" am: 4fc8b6e14d am: cb0927f028 am: 7ea241d0b3 Steve Kim 2021-03-29 19:08:09 +00:00
• 7ea241d0b3 Merge "Make libfreetype2 available to vendor" am: 4fc8b6e14d am: cb0927f028 Steve Kim 2021-03-29 18:22:41 +00:00
• cb0927f028 Merge "Make libfreetype2 available to vendor" am: 4fc8b6e14d Steve Kim 2021-03-29 17:47:31 +00:00
• 4fc8b6e14d Merge "Make libfreetype2 available to vendor" Steve Kim 2021-03-29 17:14:42 +00:00
• 307be00ad9 Make libfreetype2 available to vendor Steve Kim 2021-03-24 20:11:47 -07:00
• 61ab160de8 Replace llndk_library with llndk clause in cc_library Colin Cross 2021-03-09 16:01:26 -08:00
• 991b1c4458 [automerger skipped] Mark ab/7061308 as merged in stage. am: 2e4f7b31f1 -s ours am: 7e1045ffbb -s ours Xin Li 2021-02-20 09:52:27 +00:00
• 7e1045ffbb [automerger skipped] Mark ab/7061308 as merged in stage. am: 2e4f7b31f1 -s ours Xin Li 2021-02-20 09:09:04 +00:00
• 2e4f7b31f1 Mark ab/7061308 as merged in stage. Xin Li 2021-02-20 00:24:07 -08:00
• 9c1c0000c5 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/freetype" am: 7f4f3d656a am: 65f401e29e am: 852f219b75 Bob Badour 2021-02-17 17:22:24 +00:00
• 852f219b75 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/freetype" am: 7f4f3d656a am: 65f401e29e Bob Badour 2021-02-17 16:47:55 +00:00
• 65f401e29e Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/freetype" am: 7f4f3d656a Bob Badour 2021-02-17 15:54:03 +00:00
• 7f4f3d656a Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/freetype" Bob Badour 2021-02-17 15:31:55 +00:00
• aafc13f06c [LSC] Add LOCAL_LICENSE_KINDS to external/freetype Bob Badour 2021-02-12 21:28:24 -08:00
• e4cc677155 Merge "Use 'private: true' for the LLDNK-private library" am: 24d8ba6194 am: 97954da51e am: 634ab8f475 Treehugger Robot 2021-01-08 01:27:50 +00:00
• 634ab8f475 Merge "Use 'private: true' for the LLDNK-private library" am: 24d8ba6194 am: 97954da51e Treehugger Robot 2021-01-08 01:01:06 +00:00
• 97954da51e Merge "Use 'private: true' for the LLDNK-private library" am: 24d8ba6194 Treehugger Robot 2021-01-08 01:00:34 +00:00
• 24d8ba6194 Merge "Use 'private: true' for the LLDNK-private library" Treehugger Robot 2021-01-08 00:57:35 +00:00
• 944e9ce95a Use 'private: true' for the LLDNK-private library Justin Yun 2021-01-07 15:51:45 +09:00
• 6f6e4d3463 [automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: bee4d54ba2 am: 3d4cf6793f -s ours am: ef75491cd6 -s ours Bill Yi 2021-01-06 15:21:21 +00:00
• 5a3b56cc57 [automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 383a7d38b1 am: 90cc2afb8a -s ours am: 1616b71cba -s ours Bill Yi 2021-01-06 15:21:14 +00:00
• ef75491cd6 [automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: bee4d54ba2 am: 3d4cf6793f -s ours Bill Yi 2021-01-06 14:43:29 +00:00
• 1616b71cba [automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 383a7d38b1 am: 90cc2afb8a -s ours Bill Yi 2021-01-06 14:43:21 +00:00
• 3d4cf6793f Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: bee4d54ba2 Bill Yi 2021-01-06 14:19:26 +00:00
• 90cc2afb8a Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 383a7d38b1 Bill Yi 2021-01-06 14:19:21 +00:00
• bee4d54ba2 Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" Bill Yi 2021-01-06 13:58:57 +00:00
• 383a7d38b1 Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE Bill Yi 2021-01-05 18:27:49 -08:00
• 674e3a4502 [automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: c30ef4b9ce -s ours am: 77447729f4 -s ours Bill Yi 2021-01-05 21:58:52 +00:00
• 77447729f4 [automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: c30ef4b9ce -s ours Bill Yi 2021-01-05 21:40:26 +00:00
• c30ef4b9ce Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE Bill Yi 2021-01-05 08:51:08 -08:00
• af83fdbe5e Mark ab/6881855 as merged am: 75b4fbd046 am: 549fead606 Xin Li 2020-11-24 02:00:19 +00:00
• 549fead606 Mark ab/6881855 as merged am: 75b4fbd046 Xin Li 2020-11-24 01:03:50 +00:00
• 75b4fbd046 Mark ab/6881855 as merged Xin Li 2020-11-23 11:30:08 -08:00
• 61b6f88bc3 Merge cherrypicks of [13083486, 13083716, 13083431, 13083573, 13083545, 13083736, 13083575, 13083776, 13083778, 13083757, 13083547, 13083530, 13083719, 13083780, 13083739, 13083549, 13083741, 13083742, 13083590, 13083593, 13083594, 13083816, 13083818, 13083820, 13083822, 13083824, 13083827, 13083828, 13083552, 13083760, 13083762, 13083764, 13083782, 13083784, 13083831, 13083787, 13083766, 13083835, 13083745, 13083877, 13083720, 13083489, 13083491, 13083274, 13083859, 13083897] into rvc-qpr1-release android-build-team Robot 2020-11-18 23:06:40 +00:00
• 358c238408 Cherry-pick one upstream patch Seigo Nonaka 2020-10-21 19:22:22 -07:00
• a1e00f6835 Cherry-pick one upstream patch Seigo Nonaka 2020-10-21 19:22:22 -07:00
• a878d5fd41 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 am: 47a65cfef3 am: 6f4fe149c0 am: fe2fc0873e Seigo Nonaka 2020-11-11 05:57:13 +00:00
• 29ff74ec1c Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 am: 47a65cfef3 am: 7ab9b61462 am: 8e55e21b8c Seigo Nonaka 2020-11-11 05:57:06 +00:00
• fe2fc0873e Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 am: 47a65cfef3 am: 6f4fe149c0 Seigo Nonaka 2020-11-11 05:28:17 +00:00
• 8e55e21b8c Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 am: 47a65cfef3 am: 7ab9b61462 Seigo Nonaka 2020-11-11 05:27:59 +00:00
• 6f4fe149c0 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 am: 47a65cfef3 Seigo Nonaka 2020-11-11 05:17:37 +00:00
• 25249ebf4b Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 am: 7b9e3fba16 Seigo Nonaka 2020-11-11 05:17:28 +00:00
• 7ab9b61462 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 am: 47a65cfef3 Seigo Nonaka 2020-11-11 05:17:16 +00:00
• 7b9e3fba16 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 Seigo Nonaka 2020-11-11 04:54:29 +00:00
• 47a65cfef3 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 am: d0349d0f96 Seigo Nonaka 2020-11-11 04:54:12 +00:00
• d0349d0f96 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 am: b206933b31 Seigo Nonaka 2020-11-11 04:41:05 +00:00
• b206933b31 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 am: 89c27b47a2 Seigo Nonaka 2020-11-11 04:13:59 +00:00
• 89c27b47a2 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 am: 051d5c8315 Seigo Nonaka 2020-11-11 03:55:36 +00:00
• 051d5c8315 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe am: 0e44d33cd4 Seigo Nonaka 2020-11-11 03:31:45 +00:00
• 0e44d33cd4 Cherry-pick one upstream patch am: 573e921c6d am: fa3b7c5efe Seigo Nonaka 2020-11-11 03:14:16 +00:00
• 8a75cdc6b9 Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: 8f15d5b751 am: e6f87624f6 am: bd81b8e949 TreeHugger Robot 2020-11-11 02:40:44 +00:00
• 68c0d3645e Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: d389a9824d am: 16e1a6a0fd am: 6cb6a9f4a2 Seigo Nonaka 2020-11-11 02:40:38 +00:00
• 3c314cfeec Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f am: af07ec89da am: 5323a98b9f am: 19efd3fab2 Seigo Nonaka 2020-11-11 02:40:32 +00:00
• c97d1e4a1d Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: 8f15d5b751 am: 56fd87744e am: 7ab66f324e TreeHugger Robot 2020-11-11 02:40:16 +00:00
• 0ab130a660 Merge "Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: d389a9824d am: fe09b6c576" into rvc-qpr-dev-plus-aosp am: eda14ce716 Automerger Merge Worker 2020-11-11 02:40:01 +00:00
• c0e67c75f4 Merge "Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 am: e9e59912cc" into rvc-qpr-dev-plus-aosp am: 51752106b5 Automerger Merge Worker 2020-11-11 02:39:24 +00:00
• 716c2c1cdd Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f am: af07ec89da am: e8386406b9 am: 945cb37915 Seigo Nonaka 2020-11-11 02:39:01 +00:00
• fa3b7c5efe Cherry-pick one upstream patch am: 573e921c6d Seigo Nonaka 2020-11-11 02:38:41 +00:00
• 80dd641c92 Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 am: a15ce23c36 am: e7127940b3 Seigo Nonaka 2020-11-11 02:38:36 +00:00
• bd81b8e949 Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: 8f15d5b751 am: e6f87624f6 TreeHugger Robot 2020-11-11 02:08:33 +00:00
• 6cb6a9f4a2 Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: d389a9824d am: 16e1a6a0fd Seigo Nonaka 2020-11-11 02:08:27 +00:00
• 19efd3fab2 Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f am: af07ec89da am: 5323a98b9f Seigo Nonaka 2020-11-11 02:08:11 +00:00
• 7ab66f324e Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: 8f15d5b751 am: 56fd87744e TreeHugger Robot 2020-11-11 02:08:00 +00:00
• eda14ce716 Merge "Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: d389a9824d am: fe09b6c576" into rvc-qpr-dev-plus-aosp Automerger Merge Worker 2020-11-11 02:07:58 +00:00
• 51752106b5 Merge "Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 am: e9e59912cc" into rvc-qpr-dev-plus-aosp Automerger Merge Worker 2020-11-11 02:07:57 +00:00
• 94f95b4cc3 Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: d389a9824d am: fe09b6c576 Seigo Nonaka 2020-11-11 02:07:55 +00:00
• 8751d9328c Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 am: e9e59912cc Seigo Nonaka 2020-11-11 02:07:53 +00:00
• 945cb37915 Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f am: af07ec89da am: e8386406b9 Seigo Nonaka 2020-11-11 02:07:51 +00:00
• e7127940b3 Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 am: a15ce23c36 Seigo Nonaka 2020-11-11 02:07:38 +00:00
• 041a85d07b Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: c615cc8a8d TreeHugger Robot 2020-11-11 01:55:20 +00:00
• e8cae315d6 Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: 3879176a7d Seigo Nonaka 2020-11-11 01:55:14 +00:00
• 56fd87744e Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: 8f15d5b751 TreeHugger Robot 2020-11-11 01:55:13 +00:00
• fe09b6c576 Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: d389a9824d Seigo Nonaka 2020-11-11 01:55:08 +00:00
• f5a66a375a Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f am: 6d29b08bd6 Seigo Nonaka 2020-11-11 01:55:07 +00:00
• e8386406b9 Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f am: af07ec89da Seigo Nonaka 2020-11-11 01:55:03 +00:00
• a295ed1ecd Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 02e060b9e2 Seigo Nonaka 2020-11-11 01:55:00 +00:00
• a15ce23c36 Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 Seigo Nonaka 2020-11-11 01:54:59 +00:00
• e6f87624f6 Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 am: 8f15d5b751 TreeHugger Robot 2020-11-11 01:54:58 +00:00
• 16e1a6a0fd Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 am: d389a9824d Seigo Nonaka 2020-11-11 01:54:53 +00:00
• abcca771c9 Cherry-pick one upstream patch am: 8a51e41b7e am: 28daa7643b am: 7ccc8f6037 am: cc0de4ce4f Seigo Nonaka 2020-11-11 01:54:49 +00:00
• 5323a98b9f Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f am: af07ec89da Seigo Nonaka 2020-11-11 01:54:48 +00:00
• e9e59912cc Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9 Seigo Nonaka 2020-11-11 01:54:37 +00:00
• a0921eadc6 Cherry-pick one upstream patch am: 8a51e41b7e am: 28daa7643b am: e5efec0f66 am: 238a5e906d Seigo Nonaka 2020-11-11 01:54:36 +00:00
• c615cc8a8d Merge "Cherry-pick one upstream patch" into qt-dev am: f6d5488d84 am: 443f1c6551 am: 51a405ee86 TreeHugger Robot 2020-11-11 01:39:40 +00:00
• 3879176a7d Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878 am: 6873d643ca am: fb890dd199 Seigo Nonaka 2020-11-11 01:39:35 +00:00
• 6d29b08bd6 Cherry-pick one upstream patch am: 930f7ae37b am: 180f935175 am: c10438bb72 am: 5d6971d64f Seigo Nonaka 2020-11-11 01:39:30 +00:00
• 02e060b9e2 Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d Seigo Nonaka 2020-11-11 01:39:23 +00:00