aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23cc...android-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-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-cts-7.1_r18android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-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_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseDmitry Shmidt2016-10-262-0/+3
|\
| * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23cc...android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2Dmitry Shmidt2016-10-262-0/+3
| |\
| | * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23ccd8Dmitry Shmidt2016-10-262-0/+3
| |/|
| | * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppandroid-o-preview-1o-previewDmitry Shmidt2016-10-262-0/+3
| |/|
| | * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-10-262-0/+3
| | |\
| | | * Merge pull request #36 from johnstultz-work/hikey-aospHaojian Zhuang2016-10-262-0/+3
| | | |\
| | | | * HiKeyFastboot: Add short delay after flush to avoid reboot hangJohn Stultz2016-10-252-0/+3
| | | |/
* | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: da41388f...Dmitry Shmidt2016-08-311-1/+1
|\| | |
| * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: da41388f...Dmitry Shmidt2016-08-301-1/+1
| |\ \ \
| | * \ \ Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: da41388f7dDmitry Shmidt2016-08-301-1/+1
| | |\ \ \
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-08-301-1/+1
| | | |\| |
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-08-301-1/+1
| | | | |\|
| | | | | * Merge pull request #35 from hzhuang1/firmware_vendorHaojian Zhuang2016-08-301-1/+1
| | | | | |\
| | | | | | * hikey: Change PcdFirmwareVendor to "hikey"Dmitry Shmidt2016-08-301-1/+1
| | | | | |/
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 15efc9ef...Dmitry Shmidt2016-08-251-0/+39
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 15efc9ef...Dmitry Shmidt2016-08-251-0/+39
| |\| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 15efc9efd6Dmitry Shmidt2016-08-251-0/+39
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-08-251-0/+39
| | | |\| |
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-08-251-0/+39
| | | |/| | | | | | |/
| | | | * Merge pull request #33 from liuyq/hikey-aospHaojian Zhuang2016-08-251-0/+22
| | | | |\
| | | | | * HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILLYongqin Liu2016-08-251-0/+22
| | | | * | Merge pull request #34 from hzhuang1/get_snHaojian Zhuang2016-08-251-0/+17
| | | | |\ \
| | | | | * | hikey: Add 'fastboot getvar serialno' supportDmitry Shmidt2016-08-251-0/+17
| | | | |/ /
| | | | * | Merge pull request #32 from 96boards-hikey/revert-31-hikey-aospHaojian Zhuang2016-08-251-22/+0
| | | | |\ \
| | | | | * | Revert "HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILL"Haojian Zhuang2016-08-251-22/+0
| | | | |/ /
| | | | * | Merge pull request #31 from liuyq/hikey-aospHaojian Zhuang2016-08-251-0/+22
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILLYongqin Liu2016-08-251-0/+22
| | | | |/
| | | | * Merge pull request #30 from hzhuang1/sn17Haojian Zhuang2016-08-181-1/+4
| | | | |\
| | | | | * HiKey: change the serial number length to 17Haojian Zhuang2016-08-181-1/+4
| | | | |/
* | | | | HiKey: change the serial number length to 17 am: 923d6aa9fe am: c98b539064 am...Haojian Zhuang2016-08-191-1/+4
|\| | | |
| * | | | HiKey: change the serial number length to 17 am: 923d6aa9fe am: c98b539064Haojian Zhuang2016-08-191-1/+4
| |\| | |
| | * | | HiKey: change the serial number length to 17 am: 923d6aa9feHaojian Zhuang2016-08-191-1/+4
| | |\| |
| | | * | HiKey: change the serial number length to 17Haojian Zhuang2016-08-191-1/+4
| | | |\ \
| | | | * | HiKey: change the serial number length to 17Haojian Zhuang2016-08-181-1/+4
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 0269b8d2...Dmitry Shmidt2016-08-101-1/+1
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 0269b8d2...Dmitry Shmidt2016-08-101-1/+1
| |\| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 0269b8d21bDmitry Shmidt2016-08-101-1/+1
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-08-101-1/+1
| | | |\| |
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-08-101-1/+1
| | | | |\|
| | | | | * Merge pull request #29 from johnstultz-work/hikey-aospHaojian Zhuang2016-08-101-1/+1
| | | | | |\
| | | | | | * Fix abootimg support broken by ("fix the truncated serial number string")John Stultz2016-08-091-1/+1
| | | | | |/
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: dfb07b47...Dmitry Shmidt2016-08-051-2/+10
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: dfb07b47...Haojian Zhuang2016-08-051-2/+10
| |\| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: dfb07b4751Dmitry Shmidt2016-08-051-2/+10
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppHaojian Zhuang2016-08-051-2/+10
| | | |\| |
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2016-08-051-2/+10
| | | | |\|
| | | | | * Merge pull request #28 from johnstultz-work/hikey-aospHaojian Zhuang2016-08-041-2/+14
| | | | | |\
| | | | | | * DwSdDxe: Use a timeout counter to avoid uSD hang waiting for idleJohn Stultz2016-08-021-2/+10
| | | | | | * Revert "DwSdDxe: avoid sd hang"John Stultz2016-08-021-0/+4
| | | | | |/
| | | | | * Merge pull request #27 from hzhuang1/avoid_sd_hangHaojian Zhuang2016-07-221-4/+0
| | | | | |\