- 7483dd6 Empty merge ab/12770256 into aosp-main-future by Xin Li · 8 months ago main master
- f18eebb [automerger skipped] Merge 24Q4 into AOSP main am: 24c890ac9c -s ours by Xin Li · 9 months ago
- 24c890a Merge 24Q4 into AOSP main by Xin Li · 9 months ago
- 7995747 Add --disabled-rules flag to ktlint.py for rule customization am: 8b9d3f06fa by Yuyang Huang · 9 months ago tmp_24Q4_merged
- 8b9d3f0 Add --disabled-rules flag to ktlint.py for rule customization by Yuyang Huang · 9 months ago
- aa17ba4 [automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 185d733da6 -s ours by Xin Li · 10 months ago
- 185d733 Merge 24Q4 (ab/12406339) into aosp-main-future by Xin Li · 10 months ago
- 0a738a4 Disable the max-line-length warning in ktlint when format check is off by Jordan Demeulenaere · 12 months ago
- d8d0eab [automerger skipped] Merge 24Q3 to AOSP main am: 3e18b79509 -s ours am: 9a535fb73a -s ours by Xin Li · 12 months ago
- 9a535fb [automerger skipped] Merge 24Q3 to AOSP main am: 3e18b79509 -s ours by Xin Li · 12 months ago
- 3e18b79 Merge 24Q3 to AOSP main by Xin Li · 12 months ago ub-automotive-master-20240924 ub-automotive-master-20241205
- dc95771 [automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 4f78aed14a -s ours by Xin Li · 1 year, 2 months ago
- 4f78aed Merge 24Q3 (ab/11976889) to aosp-main-future by Xin Li · 1 year, 2 months ago android15-tests-dev
- 362b1d0 Disable more ktlint formatting rules by Jordan Demeulenaere · 1 year, 3 months ago
- ceadeba [automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: defc826d5a -s ours by Xin Li · 1 year, 4 months ago
- defc826 Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future by Xin Li · 1 year, 4 months ago ub-automotive-master-20240731
- be54835 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 65bcdd50c9 -s ours am: 82f0648a8e -s ours by Xin Li · 1 year, 6 months ago
- 82f0648 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 65bcdd50c9 -s ours by Xin Li · 1 year, 6 months ago
- 65bcdd5 Merge Android 14 QPR2 to AOSP main by Xin Li · 1 year, 6 months ago ub-automotive-master-20240314 ub-automotive-master-20240521
- 305462f [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 9176c8d612 -s ours by Xin Li · 1 year, 7 months ago
- 9176c8d Merge Android 24Q1 Release (ab/11220357) by Xin Li · 1 year, 7 months ago
- 181a0c7 [automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -s ours am: 92c43359ed -s ours am: ff35eafd00 -s ours am: f83371c43f -s ours by Xin Li · 1 year, 11 months ago
- f83371c [automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -s ours am: 92c43359ed -s ours am: ff35eafd00 -s ours by Xin Li · 1 year, 11 months ago ub-automotive-master-20240125
- ff35eaf [automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -s ours am: 92c43359ed -s ours by Xin Li · 1 year, 11 months ago
- 92c4335 [automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -s ours by Xin Li · 1 year, 11 months ago
- e4ad283 [automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours by Xin Li · 1 year, 11 months ago
- 7fa37a8 Merge Android 14 by Xin Li · 1 year, 11 months ago ub-automotive-master-20231011 ub-automotive-master-20231102
- 701dac4 Disable more ktlint rules when we should not check formatting by Mike Schneider · 2 years ago
- 8f74775 [automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours am: 0b464330dd -s ours am: 6e2e302294 -s ours am: 797eea8f95 -s ours by Xin Li · 2 years ago
- 471e77d Disable more ktlint rules when we should not check formatting by Jordan Demeulenaere · 2 years ago
- 797eea8 [automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours am: 0b464330dd -s ours am: 6e2e302294 -s ours by Xin Li · 2 years ago
- 6e2e302 [automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours am: 0b464330dd -s ours by Xin Li · 2 years ago
- 0b46433 [automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours by Xin Li · 2 years ago
- e7af306 Disable the comment-wrapping rule when ktlint should not check format by Jordan Demeulenaere · 2 years ago
- 1fb18b8 Format ktlint.py by Jordan Demeulenaere · 2 years ago
- 5d70a69 Merge Android U (ab/10368041) by Xin Li · 2 years ago
- 1b98e00 Disable annotation rules in ktlint by Nataniel Borges · 2 years, 1 month ago
- 36625fa ktlint: update ktlint to 0.50.0 by Yifei Zhang · 2 years, 1 month ago
- ac169bb Merge "[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am: 13e52e6733 -s ours" by Automerger Merge Worker · 2 years, 6 months ago
- d1b5204 [automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am: 13e52e6733 -s ours by Xin Li · 2 years, 6 months ago
- c7b4e2a [automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours am: 504c441746 -s ours by Xin Li · 2 years, 6 months ago
- 13e52e6 [automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours by Xin Li · 2 years, 6 months ago android14-d2-release android14-d2-s1-release android14-d2-s2-release android14-d2-s3-release android14-d2-s4-release android14-d2-s5-release android14-qpr1-automotiveos-release android14-qpr1-release android14-qpr1-s2-release android-14.0.0_r16 android-14.0.0_r17 android-14.0.0_r18 android-14.0.0_r19 android-14.0.0_r20 android-14.0.0_r21 android-14.0.0_r22 android-14.0.0_r23 android-14.0.0_r24 android-14.0.0_r25 android-14.0.0_r26 android-14.0.0_r27 android-14.0.0_r38 android-14.0.0_r39 android-14.0.0_r40 android-14.0.0_r41 android-14.0.0_r42 android-14.0.0_r43 android-14.0.0_r44 android-14.0.0_r45 android-automotiveos-14.0.0_lts2 android-automotiveos-14.0.0_lts3 android-automotiveos-14.0.0_lts4 android-automotiveos-14.0.0_lts5 android-automotiveos-14.0.0_lts6 android-automotiveos-14.0.0_lts7
- 504c441 [automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s ours by Xin Li · 2 years, 6 months ago
- 0a2261d [automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours am: 8bf8bc37e5 -s ours by Xin Li · 2 years, 6 months ago android14-dev android14-prebuilt-test
- 8bf8bc3 [automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours by Xin Li · 2 years, 6 months ago ub-automotive-master-20230622
- 4434eae [automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours by Xin Li · 2 years, 6 months ago
- 8ff5962 Merge Android 13 QPR2 by Xin Li · 2 years, 6 months ago android-u-beta-1-gpl ub-automotive-master-20230427
- 04279af Merge "Allow custom editorconfig if needed" by Simon Wingrove · 2 years, 7 months ago
- bcf7d04 Merge "Prevent java.util.* wildcards from being supported" by Simon Wingrove · 2 years, 7 months ago
- 7c3dbc4 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f28ac20316 -s ours am: d7667cdb57 -s ours by Xin Li · 2 years, 8 months ago
- d7667cd [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f28ac20316 -s ours by Xin Li · 2 years, 8 months ago
- f28ac20 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 by Xin Li · 2 years, 8 months ago
- 10cb9cd Prevent java.util.* wildcards from being supported by Simon Wingrove · 2 years, 8 months ago
- f32bd8e Allow custom editorconfig if needed by Simon Wingrove · 2 years, 8 months ago
- 76c4127 Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" into stage-aosp-master am: fe0af5577c -s ours am: 518d4b1be2 -s ours by Automerger Merge Worker · 2 years, 9 months ago
- 848e800 [automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: c85c9a6626 -s ours am: a3979899a9 -s ours by Xin Li · 2 years, 9 months ago
- 26268b4 [automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: bb20efb357 -s ours am: 2a2fc55ba4 -s ours by Xin Li · 2 years, 9 months ago
- 518d4b1 Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" into stage-aosp-master am: fe0af5577c -s ours by Automerger Merge Worker · 2 years, 9 months ago
- a397989 [automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: c85c9a6626 -s ours by Xin Li · 2 years, 9 months ago
- 2a2fc55 [automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: bb20efb357 -s ours by Xin Li · 2 years, 9 months ago
- fe0af55 Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" into stage-aosp-master by Automerger Merge Worker · 2 years, 9 months ago
- c85c9a6 [automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours by Xin Li · 2 years, 9 months ago
- bb20efb [automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours by Xin Li · 2 years, 9 months ago
- 2ace708 Merge Android 13 QPR1 by Xin Li · 2 years, 9 months ago main-16k-with-phones ub-automotive-master-20221215 ub-automotive-master-20230303
- a7e23cb [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 00e265c5a0 -s ours am: 5eba9f57b3 -s ours by Xin Li · 2 years, 11 months ago
- 5eba9f5 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 00e265c5a0 -s ours by Xin Li · 2 years, 11 months ago
- 00e265c Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 by Xin Li · 2 years, 11 months ago
- 430ed10 Allow preupload hooks to ignore more formatting ktlint rules am: aa768f01db am: 3f02d12653 by Jordan Demeulenaere · 2 years, 11 months ago
- 3f02d12 Allow preupload hooks to ignore more formatting ktlint rules am: aa768f01db by Jordan Demeulenaere · 2 years, 11 months ago
- aa768f0 Allow preupload hooks to ignore more formatting ktlint rules by Jordan Demeulenaere · 2 years, 11 months ago android13-qpr3-c-s1-release android13-qpr3-c-s10-release android13-qpr3-c-s11-release android13-qpr3-c-s12-release android13-qpr3-c-s2-release android13-qpr3-c-s3-release android13-qpr3-c-s4-release android13-qpr3-c-s5-release android13-qpr3-c-s6-release android13-qpr3-c-s7-release android13-qpr3-c-s8-release android-13.0.0_r58 android-13.0.0_r59 android-13.0.0_r60 android-13.0.0_r64 android-13.0.0_r65 android-13.0.0_r66 android-13.0.0_r72 android-13.0.0_r73 android-13.0.0_r74 android-13.0.0_r80 android-13.0.0_r81 android-13.0.0_r82
- 080abfa Fix ktlint hook am: 4149cdeb01 am: ca97269aa5 by Jordan Demeulenaere · 3 years, 3 months ago
- ca97269 Fix ktlint hook am: 4149cdeb01 by Jordan Demeulenaere · 3 years, 3 months ago
- 4149cde Fix ktlint hook by Jordan Demeulenaere · 3 years, 3 months ago
- ee451c8 Configure ktlint the same way as google3 does am: de088d407c am: c39a0cc1fd by Jordan Demeulenaere · 3 years, 3 months ago
- c39a0cc Configure ktlint the same way as google3 does am: de088d407c by Jordan Demeulenaere · 3 years, 3 months ago
- de088d4 Configure ktlint the same way as google3 does by Jordan Demeulenaere · 3 years, 3 months ago
- 0e8f4c6 Update ktlint prebuilt to 0.46.0 am: 1aaf3e4b03 am: 90582e6152 by Nicolo' Mazzucato · 3 years, 3 months ago
- 90582e6 Update ktlint prebuilt to 0.46.0 am: 1aaf3e4b03 by Nicolo' Mazzucato · 3 years, 3 months ago
- 1aaf3e4 Update ktlint prebuilt to 0.46.0 by Nicolo' Mazzucato · 3 years, 3 months ago
- 166b29c Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: b549aeeae2 am: a407992cf4 by Dave Mankoff · 3 years, 5 months ago
- a407992 Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: b549aeeae2 by Dave Mankoff · 3 years, 5 months ago aml_tz4_332714010 android13-mainline-tzdata4-release aml_tz4_331012000 aml_tz4_331012040 aml_tz4_331012050 aml_tz4_331314010 aml_tz4_331314020 aml_tz4_331314030 aml_tz4_331910000 aml_tz4_332714010 aml_tz4_332714050 aml_tz4_332714070 aml_tz4_332714200 aml_tz4_334103000
- 7039064 Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: b549aeeae2 by Dave Mankoff · 3 years, 5 months ago
- b549aee Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 by Dave Mankoff · 3 years, 5 months ago android13-dev android13-frc-odp-release android13-mainline-go-adservices-release android13-prebuilt-test main-16k aml_go_ads_330913000 aml_go_ads_330915000 aml_go_ads_330915100 aml_go_odp_330912000 t_frc_ase_330444010 t_frc_odp_330442000 t_frc_odp_330442040 ub-automotive-master-20221102
- 56efda6 Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 by Dave Mankoff · 3 years, 5 months ago
- a2f8726 Fix ktlint formatting. am: bfc4cbe959 by Dave Mankoff · 3 years, 5 months ago
- bfc4cbe Fix ktlint formatting. by Dave Mankoff · 3 years, 5 months ago
- 88bbf20 Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abad am: 5ec9533779 am: df4d427876 by Ember Rose · 3 years, 10 months ago
- df4d427 Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abad am: 5ec9533779 by Ember Rose · 3 years, 10 months ago
- 5ec9533 Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abad by Ember Rose · 3 years, 10 months ago
- 4dfff5a Update ktlint.py hashbang to Python 3 am: e0287ddf91 by Ember Rose · 3 years, 10 months ago android-s-qpr3-beta-1 android-s-v2-beta-3 android-t-preview-1 android-s-qpr3-beta-1 android-s-v2-beta-3 android-t-beta-3 android-t-preview-1 android-t-preview-2
- e0287dd Update ktlint.py hashbang to Python 3 by Ember Rose · 3 years, 10 months ago
- fce950f [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 12e4973a91 -s ours am: 0c32278962 am: a3f6c8dd6a am: aafe201a62 -s ours by Xin Li · 5 years ago android-s-v2-preview-1 android12--mainline-release android12-dev android12-mainline-art-release android12-mainline-networkstack-release android12-prebuilt-test android12-qpr1-d-release android12-qpr1-d-s1-release android12-qpr1-d-s2-release android12-qpr1-d-s3-release android12-qpr1-release android12-qpr3-release android12-qpr3-s1-release android12-qpr3-s2-release android12-qpr3-s3-release android12-qpr3-s4-release android12-qpr3-s5-release android12-qpr3-s6-release android12-qpr3-s7-release android12L-d2-release android12L-d2-s1-release android12L-d2-s2-release android12L-d2-s3-release android12L-d2-s4-release android12L-d2-s5-release android12L-d2-s6-release android12L-d2-s7-release android12L-d2-s8-release android12L-dev android12L-gsi android12L-platform-release android12L-platform-s1-release android12L-release android12L-s1-release android12L-security-release android12L-tests-release aml_tz3_311312010 android-12.0.0_r16 android-12.0.0_r18 android-12.0.0_r19 android-12.0.0_r20 android-12.0.0_r21 android-12.0.0_r26 android-12.0.0_r27 android-12.0.0_r28 android-12.0.0_r29 android-12.0.0_r32 android-12.1.0_r1 android-12.1.0_r10 android-12.1.0_r11 android-12.1.0_r12 android-12.1.0_r13 android-12.1.0_r14 android-12.1.0_r15 android-12.1.0_r16 android-12.1.0_r17 android-12.1.0_r18 android-12.1.0_r19 android-12.1.0_r2 android-12.1.0_r20 android-12.1.0_r21 android-12.1.0_r22 android-12.1.0_r23 android-12.1.0_r24 android-12.1.0_r25 android-12.1.0_r26 android-12.1.0_r27 android-12.1.0_r3 android-12.1.0_r4 android-12.1.0_r5 android-12.1.0_r6 android-12.1.0_r7 android-12.1.0_r8 android-12.1.0_r9 android-cts-12.1_r1 android-cts-12.1_r10 android-cts-12.1_r11 android-cts-12.1_r12 android-cts-12.1_r13 android-cts-12.1_r14 android-cts-12.1_r2 android-cts-12.1_r3 android-cts-12.1_r4 android-cts-12.1_r5 android-cts-12.1_r6 android-cts-12.1_r7 android-cts-12.1_r8 android-cts-12.1_r9 android-mainline-12.0.0_r100 android-mainline-12.0.0_r113 android-mainline-12.0.0_r115 android-mainline-12.0.0_r122 android-mainline-12.0.0_r19 android-mainline-12.0.0_r22 android-mainline-12.0.0_r36 android-mainline-12.0.0_r39 android-mainline-12.0.0_r4 android-mainline-12.0.0_r42 android-mainline-12.0.0_r49 android-mainline-12.0.0_r5 android-mainline-12.0.0_r56 android-mainline-12.0.0_r59 android-mainline-12.0.0_r63 android-mainline-12.0.0_r69 android-mainline-12.0.0_r70 android-mainline-12.0.0_r77 android-mainline-12.0.0_r98 android-mainline-12.0.0_r99 android-platform-12.1.0_r1 android-platform-12.1.0_r10 android-platform-12.1.0_r11 android-platform-12.1.0_r12 android-platform-12.1.0_r13 android-platform-12.1.0_r14 android-platform-12.1.0_r15 android-platform-12.1.0_r16 android-platform-12.1.0_r17 android-platform-12.1.0_r18 android-platform-12.1.0_r19 android-platform-12.1.0_r2 android-platform-12.1.0_r20 android-platform-12.1.0_r21 android-platform-12.1.0_r22 android-platform-12.1.0_r23 android-platform-12.1.0_r24 android-platform-12.1.0_r25 android-platform-12.1.0_r26 android-platform-12.1.0_r27 android-platform-12.1.0_r28 android-platform-12.1.0_r29 android-platform-12.1.0_r3 android-platform-12.1.0_r30 android-platform-12.1.0_r31 android-platform-12.1.0_r32 android-platform-12.1.0_r33 android-platform-12.1.0_r34 android-platform-12.1.0_r35 android-platform-12.1.0_r36 android-platform-12.1.0_r37 android-platform-12.1.0_r4 android-platform-12.1.0_r5 android-platform-12.1.0_r6 android-platform-12.1.0_r7 android-platform-12.1.0_r8 android-platform-12.1.0_r9 android-s-v2-beta-2 android-s-v2-preview-1 android-s-v2-preview-2 android-security-12.1.0_r1 android-security-12.1.0_r2 android-security-12.1.0_r3 android-security-12.1.0_r4 android-security-12.1.0_r5 android-security-12.1.0_r6 android-security-12.1.0_r7 android-vts-12.1_r1 android-vts-12.1_r10 android-vts-12.1_r11 android-vts-12.1_r12 android-vts-12.1_r13 android-vts-12.1_r14 android-vts-12.1_r2 android-vts-12.1_r3 android-vts-12.1_r4 android-vts-12.1_r5 android-vts-12.1_r6 android-vts-12.1_r7 android-vts-12.1_r8 android-vts-12.1_r9
- aafe201 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 12e4973a91 -s ours am: 0c32278962 am: a3f6c8dd6a by Xin Li · 5 years ago android-s-beta-4 android-s-beta-5 android-s-beta-1 android-s-beta-2 android-s-beta-3 android-s-beta-4 android-s-beta-5 android-s-preview-1
- a3f6c8d [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 12e4973a91 -s ours am: 0c32278962 by Xin Li · 5 years ago
- 0c32278 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 12e4973a91 -s ours by Xin Li · 5 years ago
- 12e4973 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master by Xin Li · 5 years ago androidx-sqlite-inspection-release android-r-beta-2 android-r-beta-3
- 30dc343 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am: 1eeba3ee4a am: 30cd40fbfb am: f1404fdfe2 -s ours by Xin Li · 5 years ago
- f1404fd [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am: 1eeba3ee4a am: 30cd40fbfb by Xin Li · 5 years ago
- 30cd40f [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am: 1eeba3ee4a by Xin Li · 5 years ago
- 426d59c DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 by Xin Li · 5 years ago
