summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 6844436 from ebd337c4594a04d4f7908978f0d7b676c3b5e002 to simp...simpleperf-releaseandroid-build-prod (mdb)2020-09-170-0/+0
|\
| * Snap for 6844436 from ebd337c4594a04d4f7908978f0d7b676c3b5e002 to simpleperf-...android-build-prod (mdb)2020-09-170-0/+0
|/|
| * [automerger skipped] Merge "Import goldfish soong namespaces to mini_common.m...HEADmasterTreehugger Robot2020-05-180-0/+0
| |\
| * \ 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
| |\ \ \ | | |/ / | |/| |
| * | | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin 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 "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge "Snap for 6577974 from d5115091539779ab9fa4d4247c89d43cbb20dbbe to simp...android-build-prod (mdb)2020-06-102-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Snap for 6577974 from d5115091539779ab9fa4d4247c89d43cbb20dbbe to simpleperf-...android-build-prod (mdb)2020-06-102-0/+6
|/| | | | | | | | | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 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
| | |/ / / / / /
| * | | | | | / 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
| |/ / / / /
* | | | | | Merge "Snap for 6317425 from 66a3702708ca934117f1217950d4d5abca05380f to simp...android-build-prod (mdb)2020-03-200-0/+0
|\ \ \ \ \ \
| * | | | | | Snap for 6317425 from 66a3702708ca934117f1217950d4d5abca05380f to simpleperf-...android-build-prod (mdb)2020-03-200-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
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | Merge "Snap for 6079754 from 90ffc33a7cae0202ac9c201aa2f926057ffe4cc6 to simp...android-build-prod (mdb)2019-12-170-0/+0
|\ \ \ \ \ \
| * | | | | | Snap for 6079754 from 90ffc33a7cae0202ac9c201aa2f926057ffe4cc6 to simpleperf-...android-build-prod (mdb)2019-12-170-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 "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 "Snap for 5991463 from de1b4be0c4715a22837129f65cdabd6c8f5b8d7e to simp...android-build-prod (mdb)2019-11-060-0/+0
|\ \ \ \ \ \
| * | | | | | Snap for 5991463 from de1b4be0c4715a22837129f65cdabd6c8f5b8d7e to simpleperf-...android-build-prod (mdb)2019-11-060-0/+0
|/| | | | | | | |/ / / / /
| * | | / / Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| |\| | | | | | |_|/ / | |/| | |
| | * | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-020-0/+0
| | |\| | | | | |/ | | |/|
* | | | Merge "Snap for 5933730 from f1f1b0a01324bcb5fc894b8482dec75cce8ff7c5 to simp...android-build-prod (mdb)2019-10-111-1/+0
|\ \ \ \
| * | | | Snap for 5933730 from f1f1b0a01324bcb5fc894b8482dec75cce8ff7c5 to simpleperf-...android-build-prod (mdb)2019-10-111-1/+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
| |/| | | | | | |/ | | |/|
| | * | 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
| | |\ | | |/ | |/|
| | * 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
| | |\
| | * \ Push cameraserver downstream from base_system.mk.Patrik Fimml2018-12-061-0/+1
| | |\ \
| | * \ \ Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356 am: ...Anton Hansson2018-06-271-3/+7
| | |\ \ \
* | | \ \ \ Merge "Snap for 5590161 from 19720b265900be40b1e479be10756bff177a7b86 to simp...android-build-prod (mdb)2019-05-210-0/+0
|\ \ \ \ \ \
| * | | | | | Snap for 5590161 from 19720b265900be40b1e479be10756bff177a7b86 to simpleperf-...android-build-prod (mdb)2019-05-210-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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | [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
|/ / /