aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: ↵Xin Li2024-09-070-0/+0
|\ | | | | | | | | | | | | | | | | | | | | 95b75a128b -s ours am skip reason: Merged-In Ice09a7ad54167e68cd2dc892692fc49a0afbabc1 with SHA-1 5f07eaa43b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3257975 Change-Id: If7766e866565107ad68376203b0eae4dfacec261 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * Merge "Merge 24Q3 to AOSP main" into mainXin Li2024-09-07141-144/+172
| |\
* | \ [automerger skipped] Merge 24Q3 to AOSP main am: 9248b5abb8 -s oursXin Li2024-09-070-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | am skip reason: Merged-In Ice09a7ad54167e68cd2dc892692fc49a0afbabc1 with SHA-1 5f07eaa43b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3257975 Change-Id: I542f37e5fa6813a5727aa92e1f7e568540a80c03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | Merge 24Q3 to AOSP mainXin Li2024-09-05141-144/+172
| |\ \ | |/ / |/| / | |/ | | | | Bug: 357762254 Merged-In: Ice09a7ad54167e68cd2dc892692fc49a0afbabc1 Change-Id: If27a204b2e8db793efb9b5161449e79b75a4cdfd
* | Merge "LatinIME: Fix Implicit PendingIntent Vulnerability" into main am: ↵Treehugger Robot2024-07-031-1/+7
|\| | | | | | | | | | | | | | | | | 1b3568f9c2 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3019664 Change-Id: I47f2c0609e86e24675da39477e995709cc34a3f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * Merge "LatinIME: Fix Implicit PendingIntent Vulnerability" into mainTreehugger Robot2024-07-031-1/+7
| |\
| | * LatinIME: Fix Implicit PendingIntent Vulnerabilitytechyminati2024-06-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * checkTimeAndMaybeSetupUpdateAlarm method created an Implicit PendingIntent vulnerability, which may cause security threats in the form of denial-of-service, private data theft, and privilege escalation. * PendingIntents are Intents delegated to another app to be delivered at some future time. Creating an implicit intent wrapped under a PendingIntent is a security vulnerability that might lead to denial-of-service, private data theft, and privilege escalation. * We've used FLAG_IMMUTABLE (added in SDK 23) to create PendingIntents for SDK > 23, This prevents apps that receive the PendingIntent from filling in unpopulated properties & Ensures that PendingIntent is only delivered to trusted components. Test: m Change-Id: I68a1f3f2d81138e42092cc201d36e5d29853a86e Signed-off-by: techyminati <sinha.aryan03@gmail.com>
* | | Merge 24Q3 (ab/11976889) to aosp-main-futureXin Li2024-06-18141-144/+172
|\ \ \ | | | | | | | | | | | | | | | | | | | | Bug: 347831320 Merged-In: Ice09a7ad54167e68cd2dc892692fc49a0afbabc1 Change-Id: Iff912f47972fa25834be8d11008ffbbe2d1ad86e
| * | | Removed a few slurs from German word list.Ruihao Huang2024-06-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 342214572. Test: Flashed on device. Change-Id: Ice09a7ad54167e68cd2dc892692fc49a0afbabc1
| * | | [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to ↵Xin Li2024-05-100-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aosp-main-future am: 1464c7a30d -s ours am skip reason: Merged-In If1b1214da673fec9f1e8bede86d5780a6b5f347b with SHA-1 cef3ed4c81 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/27273967 Change-Id: I013e1922d2c07a09d6775950bb45df73ad4ad7b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Update the imports to androidx.test.filters.*Fangqiu Su2024-05-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 316941721 Test: mmma . Change-Id: I131993b35a6e350c9237f9d8422c3a274988bbfb
| * | | | Update the imports to androidx.test.filters.*Fangqiu Su2024-04-18140-143/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 316941721 Test: mmma . Change-Id: I05a7d05dc8d0acb9baecf46357757ad2453f6dbc
* | | | | [automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main ↵Xin Li2024-06-170-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e85c57fbee -s ours am skip reason: Merged-In Iede0c79fa9dbc2ea3146b829d629cfeb64f5a01c with SHA-1 1464c7a30d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3131260 Change-Id: I42dd9f0b8865ec08ce37e3060d329dc988001581 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Merge "Merge Android 14 QPR3 to AOSP main" into mainXin Li2024-06-171-13/+22
| |\ \ \ \
* | \ \ \ \ [automerger skipped] Merge Android 14 QPR3 to AOSP main am: 4f3c5a71e2 -s oursXin Li2024-06-170-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In Iede0c79fa9dbc2ea3146b829d629cfeb64f5a01c with SHA-1 1464c7a30d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3131260 Change-Id: Idd061597ebf252bc0f038456f802f74c9de0efdc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | | Merge Android 14 QPR3 to AOSP mainXin Li2024-06-131-13/+22
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | | | | | | Bug: 346855327 Merged-In: Iede0c79fa9dbc2ea3146b829d629cfeb64f5a01c Change-Id: I322d98ab53035bbc907f8551a97a7e5118ed022d
* | | | | Merge "Use the global default cpp_std." into main am: 675512ab0cElliott Hughes2024-06-172-4/+3
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3112039 Change-Id: Icdcebcb8224236953d871fd135e7f96ea506c4b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | Merge "Use the global default cpp_std." into mainElliott Hughes2024-06-172-4/+3
| |\ \ \ | | |/ / | |/| |
| | * | Use the global default cpp_std.Elliott Hughes2024-06-032-4/+3
| |/ / | | | | | | | | | | | | Bug: http://b/344590580 Change-Id: Icf1f9f5559596097e156aa9f1673a438741379b3
* | | Merge Android 24Q2 Release (ab/11526283) to aosp-main-futureXin Li2024-05-061-13/+22
|\ \ \ | |/ / |/| / | |/ | | | | Bug: 337098550 Merged-In: If1b1214da673fec9f1e8bede86d5780a6b5f347b Change-Id: Iede0c79fa9dbc2ea3146b829d629cfeb64f5a01c
| * [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 974aaeb80e ↵Xin Li2024-01-240-0/+0
| |\ | |/ |/| | | | | | | | | | | | | | | | | -s ours am skip reason: Merged-In Ic17ffe6c6344e65d997a574015d71d7cacbdbbc0 with SHA-1 4ff6e87cd0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/25972340 Change-Id: I1abd2101b01cccbe19f1dc48782df7031c9b5f8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | Merge Android 24Q1 Release (ab/11220357)Xin Li2024-01-170-0/+0
|\ \ | | | | | | | | | | | | | | | Bug: 319669529 Merged-In: Ic17ffe6c6344e65d997a574015d71d7cacbdbbc0 Change-Id: I720d48315a9ace42ff71280c05df2604b3ead109
| | * Baseline NewApi issuesCole Faust2024-01-101-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NewApi is a lint check that you don't call framework methods that were introduced in versions later than your min_sdk_version. We want to make this an error, so we're baselineing all existing issues. This cl was generated automatically, by taking all the NewApi issues from the reference baselines, and all the non-NewApi issues from the existing checked in baselines. Bug: 268261262 Test: Presubmits Change-Id: If1b1214da673fec9f1e8bede86d5780a6b5f347b
| | * Merge "List baseline_filename on modules that are implititly using it" into ↵Cole Faust2023-12-211-0/+3
| |/| | | | | | | | | | | | | | | | | | | | | | | | | main am: 66093bf509 am: 4ff6e87cd0 am: 04c388ff8d Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2886449 Change-Id: I7082b49e4b1ce7d2df69e5bc230a8dbae6eae956 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "List baseline_filename on modules that are implititly using it" into ↵Cole Faust2023-12-211-0/+3
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | main am: 66093bf509 am: 4ff6e87cd0 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2886449 Change-Id: I8b0f2061175f9bc112f987cb2b030b63182474b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | | Merge "List baseline_filename on modules that are implititly using it" into ↵Cole Faust2023-12-211-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main am: 66093bf509 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2886449 Change-Id: Ic17ffe6c6344e65d997a574015d71d7cacbdbbc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | Merge "List baseline_filename on modules that are implititly using it" into mainCole Faust2023-12-211-0/+3
|/| | |
| * | | List baseline_filename on modules that are implititly using itCole Faust2023-12-201-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lintable modules currently pick up files named "lint-baseline.xml" to use as the lint baseline implicitly. This is confusing because you could end up using the baseline files in more modules than intended. Lint also has a feature where it requests you remove unnecessary findings from the baseline file, so something could be necessary for one module, but unnecessary for another that accidentally picked up the baseline. We're removing the implicit detection of the baseline file, which requires all modules using it to list the baseline file explicitly. Bug: 272769514 Test: Presubmits Change-Id: Ib640f0642fbb12b96309ce518a505376dda01cb4
| * | Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot2023-12-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | am: 50606c8775 am: 2c102c2ae0 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: Id39c69ecf12113811407a1c9826fbeaf2a6622e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot2023-12-070-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 50606c8775 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: Iac3bacf27d21d97d1b46ab301db934add7c8a30b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2Treehugger Robot2023-12-071-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: I2758e3f8cf0bc5a913c956e82b5fc8d2736b55c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot2023-12-071-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 64beb0a9e3 am: aa1e083d11 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: I99cbb0639b34ad8db9294be1a09a279bcbfa00c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2 ↵Treehugger Robot2023-12-071-2/+2
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 64beb0a9e3 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: Iec2d22a85c929da7c163233b344efde4d4ab9cc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | | | | Merge "Fix erroneous LXX theme text color mappings" into main am: 1ddd171ce2Treehugger Robot2023-12-071-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2723073 Change-Id: I64bacf809c0c2340b95fd5304bcd4f52a982303e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Merge "Fix erroneous LXX theme text color mappings" into mainTreehugger Robot2023-12-071-2/+2
| |\ \ \ \
| | * | | | Fix erroneous LXX theme text color mappingsGeorg Veichtlbauer2023-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyTextInactivatedColor and functionalTextColor were wrongly assigned, eventhough correct definitions already exist. Change-Id: I06694447ee22fb609267aa2256a36a2585ad6b3f
| | | * | | Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot2023-11-170-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 489df8d31c am: be24d24a30 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I9cfc1f48131079890e7cf606ce3e0695fbf10fa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot2023-11-170-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 489df8d31c Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I58e19cabcb483d7d39427dfd131a0429fbd4b263 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453Treehugger Robot2023-11-171-0/+1
| | | | | |\ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I3dc6f4e76a131ed874df34a97fc5cab503b343d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot2023-11-171-0/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6600afade am: 21496a9149 Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: If48086c1de5f635d5dbc9eedcca3aa2219fff59a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453 am: ↵Treehugger Robot2023-11-171-0/+1
| | | | |\ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6600afade Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I493d042ec6a733865a5a3f37aeb45520f92d14d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | | | | | Merge "dicttoolkit: pin cpp_std to gnu++17" into main am: 4f396fb453Treehugger Robot2023-11-171-0/+1
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2833210 Change-Id: I9597e378e9ae4b734d373194b33373e63e2d6f85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | | | Merge "dicttoolkit: pin cpp_std to gnu++17" into mainTreehugger Robot2023-11-171-0/+1
| |\ \ \ \
| | * | | | dicttoolkit: pin cpp_std to gnu++17Tomasz Wasilczyk2023-11-151-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This project doesn't build with gnu++20 and prevents AOSP default to be upgraded to a newer standard. Once the build failure is fixed here, this change can be reverted. Bug: 311052584 Test: m checkbuild Change-Id: If2d19c1b6d970703a1dbf7685588a4a4be5a53c1
| | | * | [automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li2023-10-070-0/+0
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 378d686fee -s ours am: bc1334df98 -s ours am: 70d629ada7 -s ours am: 0bc4569103 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: Ic17411a85d7073559f73b5e19dd71eebe5284b0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* | | | | [automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li2023-10-060-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 378d686fee -s ours am: bc1334df98 -s ours am: 70d629ada7 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: If572cc291186a8315e7aac2b775d099f3369d397 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * \ \ \ \ [automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li2023-10-060-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 378d686fee -s ours am: bc1334df98 -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: Iccb504ade5d581aada92523876c08f7ad86e3660 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | [automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s ↵Xin Li2023-10-060-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 378d686fee -s ours am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I24b0acd682eed38795430c5b8dff7e435fd16548 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | [automerger skipped] Merge "Merge Android 14" into main am: 0bba80779a -s oursXin Li2023-10-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Merged-In Ia66766322d6ae8a010b1cb55cc22993fbc6d012c with SHA-1 03eef94a8d is already in history Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2776974 Change-Id: I06b761b5d03ddb799a8775797f583f51214e2176 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | Merge "Merge Android 14" into mainXin Li2023-10-064-39/+42
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-03 20:30:01 +0000