aboutsummaryrefslogtreecommitdiffstats
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: 6d207b9a6bXin Li2020-11-240-0/+0
| |\
| * \ Rename ART release APEX to com.android.art. am: 8bd7b3a49a am: 5af6bb6bba am:...Martin Stjernholm2020-10-231-1/+1
| |\ \
| | * \ Rename ART release APEX to com.android.art. am: 8bd7b3a49a am: 5af6bb6bbaMartin Stjernholm2020-10-231-1/+1
| | |\ \
* | | \ \ [LSC] Add LOCAL_LICENSE_KINDS to device/google/fuchsia am: 3f3fbdd08cBob Badour2021-02-152-0/+54
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [LSC] Add LOCAL_LICENSE_KINDS to device/google/fuchsiaandroid-s-preview-1Bob Badour2021-02-122-0/+54
|/ / / /
* | | / Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
|\| | | | |_|/ |/| |
| * | Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1 am: b9172e6cf2...Bob Badour2020-05-051-0/+3
| |\|
| * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \
| * \ \ Skip boot jars check. am: be5559adf8 am: abc2aa5459 am: 550c05a91b am: 8a1524...Mickey Keeley2020-03-281-0/+3
| |\ \ \
* | \ \ \ Rename ART release APEX to com.android.art. am: 8bd7b3a49aMartin Stjernholm2020-10-231-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Rename ART release APEX to com.android.art.Martin Stjernholm2020-10-191-1/+1
|/ / / /
* | | | Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1 am: b9172e6cf2...Bob Badour2020-05-051-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1 am: b9172e6cf2Bob Badour2020-05-051-0/+3
| |\ \ \
| | * \ \ Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICE am: 20afab60a1android-r-beta-3android-r-beta-2Bob Badour2020-05-051-0/+3
| | |\ \ \
| | | * | | Add METADATA to fuchsia: Apache2+BSD+MIT=NOTICEBob Badour2020-05-011-0/+3
* | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\| | |
| | * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| | |\ \ \
| | | * \ \ Skip boot jars check. am: be5559adf8 am: abc2aa5459Mickey Keeley2020-03-281-0/+3
| | | |\ \ \ | | | |/ / / | | |/| | |
* | | | | | Skip boot jars check. am: be5559adf8 am: abc2aa5459 am: 550c05a91bMickey Keeley2020-03-281-0/+3
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Skip boot jars check. am: be5559adf8 am: abc2aa5459Mickey Keeley2020-03-281-0/+3
|/| | | | | |/ / /
| * | | Skip boot jars check. am: be5559adf8Mickey Keeley2020-03-281-0/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * Skip boot jars check.Mickey Keeley2020-03-281-0/+3
| |/
* | Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: 95...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-releaseAutomerger Merge Worker2019-12-201-10/+17
|\|
| * Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: 95...android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker2019-12-201-10/+17
| |\
| | * Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMARJiyong Park2019-12-191-10/+17
| | |\
| | | * Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMARandroid-r-preview-1Jiyong Park2019-12-191-10/+17
* | | | Revert submission 1191937-art_apex_available am: 2af940b63b am: 111df5aa0a am...Automerger Merge Worker2019-12-191-17/+10
|\| | |
| * | | Revert submission 1191937-art_apex_available am: 2af940b63b am: 111df5aa0aAutomerger Merge Worker2019-12-191-17/+10
| |\| |
| | * | Revert submission 1191937-art_apex_availableJoseph Murphy2019-12-181-17/+10
| | |\|
| | | * Revert submission 1191937-art_apex_availableJoseph Murphy2019-12-191-17/+10
* | | | Rename modules that are APEX-only am: 19b02461a9 am: 5e7f2ff7a7 am: 4f4dee1aefAutomerger Merge Worker2019-12-191-10/+17
|\| | |
| * | | Rename modules that are APEX-only am: 19b02461a9 am: 5e7f2ff7a7Automerger Merge Worker2019-12-191-10/+17
| |\| |
| | * | Rename modules that are APEX-onlyJiyong Park2019-12-181-10/+17
| | |\|
| | | * Rename modules that are APEX-onlyJiyong Park2019-12-171-10/+17
| | |/
* | | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
|\| |
| * | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| |\|
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li2019-10-300-0/+0
| | |\
* | | | Revert "Relax sysprop neverallow rules for Fuchsia targets." am: cac5f48484 a...Inseob Kim2019-10-181-1/+0
|\| | |
| * | | Revert "Relax sysprop neverallow rules for Fuchsia targets." am: cac5f48484 a...Inseob Kim2019-10-181-1/+0
| |\ \ \
| | * | | Revert "Relax sysprop neverallow rules for Fuchsia targets." am: cac5f48484Inseob Kim2019-10-181-1/+0
| | |\| |
| | | * | Revert "Relax sysprop neverallow rules for Fuchsia targets."Inseob Kim2019-10-181-1/+0
| | | |\ \
| | | | * | Revert "Relax sysprop neverallow rules for Fuchsia targets."Inseob Kim2019-10-181-1/+0
* | | | | | Relax sysprop neverallow rules for Fuchsia targets. am: b03b756ad0 am: cdf0ad...Mickey Keeley2019-10-161-0/+1
|\| | | | |
| * | | | | Relax sysprop neverallow rules for Fuchsia targets. am: b03b756ad0 am: cdf0ad...Mickey Keeley2019-10-161-0/+1
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Relax sysprop neverallow rules for Fuchsia targets. am: b03b756ad0Mickey Keeley2019-10-161-0/+1
| | |\| |
| | | * | Relax sysprop neverallow rules for Fuchsia targets.Mickey Keeley2019-10-161-0/+1
| | |/| | | | | |/
| | | * Relax sysprop neverallow rules for Fuchsia targets.Mickey Keeley2019-10-161-0/+1
* | | | Add core-icu4j into PRODUCT_PACKAGES am: 6a21031e6a am: 03a9cc3184 am: 08ab19...Victor Chang2019-08-131-0/+1
|\| | |