summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark ab/7061308 as merged in stage.HEADandroid-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-4Xin Li2021-02-200-0/+0
|\
| * Mark ab/6881855 as merged am: bdb8c8575eXin Li2020-11-240-0/+0
| |\
| * \ Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5d am: 7b8ded...Yifan Hong2020-10-291-0/+1
| |\ \
| | * \ Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5dYifan Hong2020-10-291-0/+1
| | |\ \
| * | | | [automerger skipped] Skip ab/6749736 in stage. am: 1f4114a71c -s ours am: 06e...Xin Li2020-10-090-0/+0
| |\| | |
| | * | | [automerger skipped] Skip ab/6749736 in stage. am: 1f4114a71c -s oursXin Li2020-10-090-0/+0
| | |\ \ \
* | | \ \ \ Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895Treehugger Robot2021-02-051-0/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge "Add LOCAL_LICENSE_KINDS to external/mksh"android-s-preview-1Treehugger Robot2021-02-051-0/+18
|/| | | | |
| * | | | | Add LOCAL_LICENSE_KINDS to external/mkshBob Badour2021-02-051-0/+18
|/ / / / /
* | | | / Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Update the NOTICE file." am: 4d0a1a5064 am: 0734bcbddc am: 9b2839eb3a ...Treehugger Robot2020-09-011-22/+67
| |\| |
| | * | Merge "Update the NOTICE file." am: 4d0a1a5064 am: 0734bcbddc am: 9b2839eb3aTreehugger Robot2020-09-011-22/+67
| | |\ \
| | | * \ Merge "Update the NOTICE file." am: 4d0a1a5064 am: 0734bcbddcTreehugger Robot2020-09-011-22/+67
| | | |\ \
| * | | | | Merge "Upgrade to mksh R59b." am: 4adbc81376 am: efb93a535d am: d04311005c am...Treehugger Robot2020-05-2114-175/+360
| |\| | | |
| * | | | | Merge "Upgrade to mksh R59." am: f54e593e39 am: ce5d2ec295 am: fbd053ec48 am:...Treehugger Robot2020-05-2030-1968/+3628
| |\ \ \ \ \
| * \ \ \ \ \ Merge "Add METADATA to mksh: MIT=NOTICE" am: 19d12c0d97 am: 6f444b4cb6 am: e7...Bob Badour2020-04-291-0/+3
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge "Introduce sh.vendor_ramdisk." am: 3139f96069Yifan Hong2020-10-291-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge "Introduce sh.vendor_ramdisk."Yifan Hong2020-10-291-0/+1
|/| | | | | | |
| * | | | | | | Introduce sh.vendor_ramdisk.Yifan Hong2020-10-281-0/+1
* | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge "Upgrade to mksh R59b." am: 4adbc81376 am: efb93a535d am: d04311005cTreehugger Robot2020-05-2114-175/+360
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Merge "Upgrade to mksh R59." am: f54e593e39 am: ce5d2ec295 am: fbd053ec48Treehugger Robot2020-05-1930-1968/+3628
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge "Add METADATA to mksh: MIT=NOTICE" am: 19d12c0d97 am: 6f444b4cb6 am: e7...Bob Badour2020-04-291-0/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge "Update the NOTICE file." am: 4d0a1a5064Treehugger Robot2020-09-011-22/+67
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge "Update the NOTICE file."Treehugger Robot2020-09-011-22/+67
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update the NOTICE file.Elliott Hughes2020-09-011-22/+67
| |/ / / /
* | | | / Merge "Upgrade to mksh R59b." am: 4adbc81376 am: efb93a535dTreehugger Robot2020-05-2114-175/+360
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Upgrade to mksh R59b." am: 4adbc81376android-r-beta-3android-r-beta-2Treehugger Robot2020-05-2114-175/+360
| |\ \ \
| | * \ \ Merge "Upgrade to mksh R59b."Treehugger Robot2020-05-2114-175/+360
| | |\ \ \
| | | * | | Upgrade to mksh R59b.Elliott Hughes2020-05-2014-175/+360
| | |/ / /
* | | | / Merge "Upgrade to mksh R59." am: f54e593e39 am: ce5d2ec295Treehugger Robot2020-05-1930-1968/+3628
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Upgrade to mksh R59." am: f54e593e39Treehugger Robot2020-05-1930-1968/+3628
| |\| |
| | * | Merge "Upgrade to mksh R59."Treehugger Robot2020-05-1930-1968/+3628
| | |\ \
| | | * | Upgrade to mksh R59.Elliott Hughes2020-05-1530-1968/+3628
| | |/ /
* | | / Merge "Add METADATA to mksh: MIT=NOTICE" am: 19d12c0d97 am: 6f444b4cb6Bob Badour2020-04-291-0/+3
|\| | | | |_|/ |/| |
| * | Merge "Add METADATA to mksh: MIT=NOTICE" am: 19d12c0d97Bob Badour2020-04-281-0/+3
| |\|
| | * Merge "Add METADATA to mksh: MIT=NOTICE"Bob Badour2020-04-281-0/+3
| |/|
| | * Add METADATA to mksh: MIT=NOTICEBob Badour2020-04-281-0/+3
| |/
* | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li2019-10-300-0/+0
|\|
| * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
| |\
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| | |\ | | |/ | |/|
* | | Merge "mksh: stop loading libc++ and libm." am: 701334bc0c am: afaa7f8be8 am:...Elliott Hughes2019-09-241-0/+3
|\| |
| * | Merge "mksh: stop loading libc++ and libm." am: 701334bc0c am: afaa7f8be8Elliott Hughes2019-09-241-0/+3
| |\ \
| | * | Merge "mksh: stop loading libc++ and libm." am: 701334bc0cElliott Hughes2019-09-241-0/+3
| |/| | | | |/
| | * Merge "mksh: stop loading libc++ and libm."Elliott Hughes2019-09-241-0/+3
| |/|
| | * Merge "mksh: stop loading libc++ and libm."ndk-sysroot-r21Elliott Hughes2019-09-241-0/+3
| |/|
| | * mksh: stop loading libc++ and libm.Elliott Hughes2019-09-231-0/+3
| |/
* | Merge master@5428150 into git_qt-dev. am: 146c8d0123Bill Rassieur2019-04-030-0/+0
|\ \ | |/ |/|
| * Merge master@5428150 into git_qt-dev.Bill Rassieur2019-04-030-0/+0
| |\
| | * Merge master@5428150 into git_qt-dev.Bill Rassieur2019-04-0222-190/+577
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-29 09:40:34 +0000