summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r4android-platform-11.0.0_r3android-platform-11.0.0_r2android-platform-11.0.0_r1android-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-mainline-10.0.0_r4android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r5android-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_r4android-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_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-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_r10android-11.0.0_r1android-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_r12ndk-sysroot-r21android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-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-platform-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-releaseandroid10-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-resolv-releaseandroid10-mainline-networking-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
| |\
* | \ Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: 5d32321...John Stultz2018-12-201-4/+4
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: 5d32321b0bJohn Stultz2018-12-201-4/+4
| |\|
| | * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEADJohn Stultz2018-12-201-4/+4
| | |\
| | | * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEADandroid-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-releaseJohn Stultz2018-12-201-4/+4
| | | |\
| | | | * Merge pull request #79 from johnstultz-work/fastboot-overflow-fix-hikeyupstream-hikey-aospHaojian Zhuang2018-12-201-4/+4
| | | | |\
| | | | | * EmbeddedPkg/AndroidFastboot: Fix overflow in Offset calculationsJohn Stultz2018-12-191-4/+4
| | | | |/
* | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
|\| | | |
| * | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| |\| | |
| | * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| |
| | | * | Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-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-r39android-o-mr1-iot-release-smart-display-r30android-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.7Bill Yi2018-10-240-0/+0
| | | |\ \
* | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| |\| | | |
| | * | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Snap for 4579913 from 4f2fa8444202eddc6ab0a5aa0390d189b0e2b558 to pi-releaseandroid-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_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-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-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_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-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_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-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_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot2018-02-011-39/+91
| | | |\ \
| | | * \ \ Snap for 4551672 from baa7aa94b656d6762346adb2981dbee2d187e84d to pi-releaseandroid-build-team Robot2018-01-1823-336/+7286
| | | |\ \ \
| | | * \ \ \ Snap for 4471243 from f44e2252cda6586db57620bec3ea3ea356cb9a7f to pi-releaseandroid-build-team Robot2017-11-285-10/+60
| | | |\ \ \ \
| | | * \ \ \ \ Snap for 4453288 from ad44d15930869a9ac06e84df37eb4bac0fc37575 to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Snap for 4447680 from 9c3fb83d8de36b4af89e0c37a83458590d434bfb to pi-releaseandroid-build-team Robot2017-11-123747-127659/+398764
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Snap for 4393550 from 1da1d5a09ce06bce75fcd1b56659701562546287 to pi-releaseandroid-build-team Robot2017-10-131-2/+2
| | | |\ \ \ \ \ \ \
* | | | | | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: a1e5dcc...John Stultz2018-08-225-27/+29
|\| | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: a1e5dccd6aJohn Stultz2018-08-225-27/+29
| |\| | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEADJohn Stultz2018-08-225-27/+29
| |/| | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEADandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseJohn Stultz2018-08-215-27/+29
| |/| | | | | | | | | | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge pull request #76 from hzhuang1/status_2Haojian Zhuang2018-08-141-0/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | EmbeddedPkg/AbootimgLib: fix unused Status variableHaojian Zhuang2018-08-141-0/+1
| | * | | | | | | | | Merge pull request #75 from hzhuang1/initrd_2Haojian Zhuang2018-08-142-18/+20
| | |\| | | | | | | |
| | | * | | | | | | | EmbeddedPkg/AbootimgLib: make initrd kernel parameter flexibleHaojian Zhuang2018-08-141-17/+19
| | | * | | | | | | | BaseTools/tools_def: add "-fno-unwind-tables" to GCC_AARCH64_CC_FLAGSLaszlo Ersek2018-08-141-1/+1
| | |/ / / / / / / /
| | * | | | | | | | Merge pull request #72 from hzhuang1/replace_delay_2Haojian Zhuang2018-04-181-8/+8
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | MdeModulePkg/UfsPassThruDxe: use loop to polling UTRLRSRHaojian Zhuang2018-04-181-8/+8
| | |/ / / / / / / /
| | * | | | | | | | Merge pull request #69 from hzhuang1/fix_ufs_hang_2Haojian Zhuang2018-04-161-0/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | MdeModulePkg/UfsPassThruDxe: avoid ufs hang by adding delayHaojian Zhuang2018-04-161-0/+2
| | |/ / / / / / / /
| | * | | | | | | | Merge pull request #67 from hzhuang1/reboot_2Haojian Zhuang2018-03-302-3/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Revert "EmbeddedPkg/AndroidFastboot: add delay before reboot"Haojian Zhuang2018-03-302-3/+0
| | |/ / / / / / / /
* | | | | | | | | / Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk am: 27fa02b0...Dmitry Shmidt2018-03-2825-30/+946
|\| | | | | | | | | | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk am: 27fa02b096android-o-mr1-iot-release-1.0.3Dmitry Shmidt2018-03-2825-30/+946
|/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edkDmitry Shmidt2018-03-2825-30/+946
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edkandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8o-mr1-iot-preview-8Dmitry Shmidt2018-03-2725-30/+946
| | |\| | | | | | |
| | | * | | | | | | Merge pull request #65 from hzhuang1/reboot_delay_2Haojian Zhuang2018-03-262-0/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | EmbeddedPkg/AndroidFastboot: add delay before rebootHaojian Zhuang2018-03-262-0/+3
| | | |/ / / / / / /
| | | * | | | | | | Merge pull request #63 from hzhuang1/clang_2Haojian Zhuang2018-03-063-14/+156
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | EmbeddedPkg/Abootimg.h: fix definition error on functionHaojian Zhuang2018-03-061-2/+2
| | | | * | | | | | | BaseTools/tools_def: add CLANG38 LTO versions for AARCH64 and ARMArd Biesheuvel2018-03-061-3/+95
| | | | * | | | | | | BaseTools/Gcc ARM AARCH64: add support for building device tree binariesArd Biesheuvel2018-03-062-0/+33
| | | | * | | | | | | BaseTools/Conf: Support LLVM39 and LLVM40 in CLANG38 toolchainShi, Steven2018-03-061-2/+3
| | | | * | | | | | | BaseTools: Add option in CLANG38 to disable warning unknown-warning-optionLiming Gao2018-03-061-1/+1
| | | | * | | | | | | BaseTools/tools_def: Use armv7-a for CLANG35 ARM compilations.Marvin Haeuser2018-03-061-1/+1
| | | | * | | | | | | BaseTools: Add NOOPT target in CLANG38 tool chainLiming Gao2018-03-061-9/+25
| | | |/ / / / / / /