summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Merge "Import goldfish soong namespaces to mini_common.m...HEADmasterTreehugger Robot2020-05-180-0/+0
|\
| * Merge "Import goldfish soong namespaces to mini_common.mk" am: 6c45a6eab2android-r-beta-3android-r-beta-2Treehugger Robot2020-05-181-0/+3
| |\
| | * Merge "Import goldfish soong namespaces to mini_common.mk"Treehugger Robot2020-05-181-0/+3
| | |\
| | | * Import goldfish soong namespaces to mini_common.mkRoman Kiryanov2020-05-181-0/+3
| | |/
* | | Import goldfish soong namespaces to mini_common.mk am: 31a435732aRoman Kiryanov2020-05-181-0/+3
|\ \ \
| * | | Import goldfish soong namespaces to mini_common.mkandroid11-devRoman Kiryanov2020-05-141-0/+3
* | | | Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbb am: e66d7...Treehugger Robot2020-05-051-0/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbbTreehugger Robot2020-05-051-0/+3
| |\|
| | * Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE"Treehugger Robot2020-05-051-0/+3
| |/|
| | * Add METADATA to armv7-a-neon: Apache2=NOTICEBob Badour2020-05-011-0/+3
| |/
* | [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...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
| | |\ | | |/ | |/|
* | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
|\| |
| * | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\ \
| | * | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | |\|
| | | * Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | | |\
* | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
|\| | | |
| * | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| |\| | | | | |_|/ | |/| |
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| |/| |
| | * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| | |\|
| | | * Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li2019-09-051-1/+0
| | | |\
| | | | * DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-041-1/+0
| | | |/| | | | |/ | | |/|
* | | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
|\| | |
| * | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-020-0/+0
|/| | | | |/ /
| * | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-011-1/+0
| |\ \ | |/ / |/| / | |/
* | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-240-0/+0
|\|
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\
* | | Remove wifilogd from armv7-a-neon .mkDavid Su2019-01-161-1/+0
* | | [automerger skipped] Merge "Push cameraserver downstream from base_system.mk....Patrik Fimml2018-12-210-0/+0
|\ \ \ | | |/ | |/|
| * | [automerger skipped] Merge "Push cameraserver downstream from base_system.mk....Patrik Fimml2018-12-210-0/+0
| |\|
| | * Merge "Push cameraserver downstream from base_system.mk."Patrik Fimml2018-12-211-0/+1
| | |\
| | | * Merge "Push cameraserver downstream from base_system.mk."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releasePatrik Fimml2018-12-211-0/+1
| | |/|
| | | * Push cameraserver downstream from base_system.mk.Patrik Fimml2018-12-121-0/+1
| | |/
* | | Push cameraserver downstream from base_system.mk.Patrik Fimml2018-12-061-0/+1
|\| |
| * | Push cameraserver downstream from base_system.mk.Patrik Fimml2018-11-231-0/+1
| |/
* | Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356 am: ...Anton Hansson2018-06-271-3/+7
|\|
| * Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseAnton Hansson2018-06-271-3/+7
|/|
| * Merge "Inline contents of core_base.mk in mini_common.mk"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseAnton Hansson2018-06-271-3/+7
|/|
| * Merge "Inline contents of core_base.mk in mini_common.mk"android-p-preview-5android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2Anton Hansson2018-06-271-3/+7
|/|
| * Inline contents of core_base.mk in mini_common.mkAnton Hansson2018-06-271-3/+7
|/
* Merge "Revert "Replace hardware features conf file to be emulator specific"" ...android-wear-p-preview-2android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-wear-8.1.0_r1android-wear-8.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1android-8.1.0_r9android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21security-pi-releasesecurity-oc-mr1-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-devoreo-vts-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6Colin Cross2017-02-210-0/+0
|\
| * Merge "Revert "Replace hardware features conf file to be emulator specific"" ...Colin Cross2017-02-211-1/+1
| |\
| | * Merge "Revert "Replace hardware features conf file to be emulator specific""android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Colin Cross2017-02-211-1/+1
| | |\
| | | * Merge "Revert "Replace hardware features conf file to be emulator specific""android-o-preview-1android-n-mr2-preview-2o-previewColin Cross2017-02-211-1/+1
| | | |\
| | | | * Revert "Replace hardware features conf file to be emulator specific"Colin Cross2017-02-181-1/+1
* | | | | Revert "Replace hardware features conf file to be emulator specific"Colin Cross2017-02-181-1/+1
* | | | | Merge "Replace hardware features conf file to be emulator specific" am: 25571...Pulkit Bhuwalka2017-02-181-1/+1
|\| | | |
| * | | | Merge "Replace hardware features conf file to be emulator specific" am: 25571...Pulkit Bhuwalka2017-02-171-1/+1
| |\| | |
| | * | | Merge "Replace hardware features conf file to be emulator specific"Pulkit Bhuwalka2017-02-171-1/+1
| |/| | | | | |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 01:36:21 +0000