summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" a...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-12-140-0/+0
|\
| * Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" a...android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2Dmitry Shmidt2016-12-140-0/+0
| |\
| | * Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk" a...Dmitry Shmidt2016-12-140-0/+0
| | |\
| | | * Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk"Dmitry Shmidt2016-12-140-0/+0
| | | |\
| | | | * Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk"android-o-preview-1o-previewTreehugger Robot2016-12-140-0/+0
| | | | |\
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: dadef...Dmitry Shmidt2016-12-140-0/+0
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: dadef...Dmitry Shmidt2016-12-140-0/+0
| |\| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: dadef...Dmitry Shmidt2016-12-140-0/+0
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-12-140-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-12-141-6/+11
| | | | |\ \
| | | | | * \ Merge pull request #23 from hzhuang1/fastboot-rebootHaojian Zhuang2016-12-141-6/+11
| | | | | |\ \
| | | | | | * | hikey: Add fastboot reboot-bootloader supportDmitry Shmidt2016-12-141-6/+11
| | | | | |/ /
* | | | | | | hikey: Add fastboot reboot-bootloader support am: 6c0bcf0061 am: 241d897365 a...Dmitry Shmidt2016-12-141-6/+11
|\| | | | | |
| * | | | | | hikey: Add fastboot reboot-bootloader support am: 6c0bcf0061 am: 241d897365Dmitry Shmidt2016-12-141-6/+11
| |\| | | | |
| | * | | | | hikey: Add fastboot reboot-bootloader support am: 6c0bcf0061Dmitry Shmidt2016-12-141-6/+11
| | |\| | | |
| | | * | | | hikey: Add fastboot reboot-bootloader supportDmitry Shmidt2016-12-141-6/+11
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | hikey: Add fastboot reboot-bootloader supportDmitry Shmidt2016-12-131-6/+11
| | | | |/ /
* | | | | | Merge changes am: adb90c2978 am: a2ef6060f7 am: 35b3175a3dDmitry Shmidt2016-12-070-0/+0
|\| | | | |
| * | | | | Merge changes am: adb90c2978 am: a2ef6060f7Dmitry Shmidt2016-12-070-0/+0
| |\| | | |
| | * | | | Merge changes am: adb90c2978Dmitry Shmidt2016-12-070-0/+0
| | |\| | |
| | | * | | Merge changesDmitry Shmidt2016-12-070-0/+0
| | | |\| |
| | | | * | Merge changes Treehugger Robot2016-12-070-0/+0
| | | | |\ \
* | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b4503...Dmitry Shmidt2016-12-071-0/+15
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b4503...Dmitry Shmidt2016-12-071-0/+15
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: b4503...Dmitry Shmidt2016-12-071-0/+15
| |/| | | | | | | |/ / / /
| | * / / / Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-12-071-0/+15
| |/| | | | | | |/ / /
| | * | / Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-12-071-0/+15
| |/| | | | | | |/ | | |/|
| | * | Merge pull request #22 from johnstultz-work/hikey-aospHaojian Zhuang2016-12-071-0/+15
| | |\|
| | | * hikey: Add android.serialno= for boot from RAMDmitry Shmidt2016-12-021-0/+15
* | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: 0b5d5...Dmitry Shmidt2016-08-251-31/+28
|\| | |
| * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: 0b5d5...Dmitry Shmidt2016-08-251-31/+28
| |\ \ \
| | * \ \ Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: 0b5d5...Dmitry Shmidt2016-08-251-31/+28
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-08-251-31/+28
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-08-251-31/+28
| | | |/| | | | | | |/
| | | | * Merge pull request #21 from hzhuang1/fb_bootHaojian Zhuang2016-08-251-31/+28
| | | | |\
| | | | | * fastboot: support fastboot boot commandHaojian Zhuang2016-08-251-31/+28
| | | | |/
* | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: 1d451...Dmitry Shmidt2016-08-191-4/+3
|\| | | |
| * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: 1d451...Dmitry Shmidt2016-08-191-4/+3
| |\| | |
| | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk am: 1d451...Dmitry Shmidt2016-08-191-4/+3
| | |\| |
| | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-08-191-4/+3
| | | |\ \
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedkDmitry Shmidt2016-08-181-4/+3
| | | | |\|
| | | | | * Merge pull request #20 from hzhuang1/sn17Haojian Zhuang2016-08-181-4/+3
| | | | | |\
| | | | | | * Bds: change sn length to 17Haojian Zhuang2016-08-181-2/+2
| | | | | | * hikey: Fix androidboot.serialno= reportDmitry Shmidt2016-08-181-3/+2
| | | | | |/
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk2 am: b96baa8...Dmitry Shmidt2016-08-054-0/+72
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk2 am: b96baa8...Haojian Zhuang2016-08-054-0/+72
|/| | | | | | |/ / / /
| * / / / Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk2 am: b96baa8ce5Dmitry Shmidt2016-08-054-0/+72
|/| | | | | |/ / /
| * / / Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk2Haojian Zhuang2016-08-054-0/+72
|/| | | | |/ /
| * / Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk2Dmitry Shmidt2016-08-054-0/+72
|/| | | |/
| * Merge pull request #18 from 96boards-hikey/revert-17-licenseHaojian Zhuang2016-08-051-26/+0
| |\