Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release- ↵android-wear-8.1.0_r1android-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_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-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_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-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-8.1.0_r9android-8.1.0_r81android-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_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-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-release | android-build-team Robot | 2017-06-25 | 1 | -18/+95 |
|\ | | | | | | | | | | | 4133428 snap-temp-L95800000077479875 Change-Id: I0a460579311fc9f44a064f43f72e8230e5a84182 | ||||
| * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵oreo-mr1-dev | Dmitry Shmidt | 2017-06-22 | 1 | -18/+95 |
|/| | | | | | | | | | | | | | | | 71183d6eab am: 466e090f06 am: ca8a8eebc2 am: 83e57f1e30 Change-Id: I20a6bc9bfdf857769b12bbd3fcc37fe1e89cda3f | ||||
| * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵ | Dmitry Shmidt | 2017-06-22 | 1 | -18/+95 |
|/| | | | | | | | | | | | | | | | 71183d6eab am: 466e090f06 am: ca8a8eebc2 Change-Id: I29a47050f01f39a4c7ca9dca6c245ed45999c9bc | ||||
| * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 71183d6eabandroid-o-mr1-preview-2android-o-mr1-preview-1 | Dmitry Shmidt | 2017-06-22 | 1 | -18/+95 |
|/| | | | | | | | | | | | am: 466e090f06 Change-Id: I8163b42b73d25bb7340e3048dd4599db600a86be | ||||
| * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp | Dmitry Shmidt | 2017-06-22 | 1 | -18/+95 |
| |\ | | | | | | | | | | | | | | | | am: 71183d6eab Change-Id: Icd67db4d03dee2730f929995ce9691b51188ff24 | ||||
| | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppandroid-o-preview-4android-o-iot-preview-5o-iot-preview-5 | Dmitry Shmidt | 2017-06-22 | 1 | -18/+95 |
| |/| | |||||
| | * | Merge pull request #42 from hzhuang1/aboot_ext | Haojian Zhuang | 2017-06-22 | 1 | -1/+64 |
| | |\ | | | | | | | | | fastboot: Add ReadPartition functionality | ||||
| | | * | fastboot: Add ReadPartition functionality | Haojian Zhuang | 2017-06-22 | 1 | -1/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2381279b5274fc1ce39f72b66130559ebfe49ceb Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> | ||||
| | * | | Merge pull request #40 from hzhuang1/fix_alpha | Haojian Zhuang | 2017-06-08 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | HiKeyFastboot: fix calculation of IS_ALPHA | ||||
| | | * | HiKeyFastboot: fix calculation of IS_ALPHA | Haojian Zhuang | 2017-06-08 | 1 | -1/+1 |
| | |/ | | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> | ||||
| | * | Merge pull request #37 from vishalbhoj/hikey-aosp | Haojian Zhuang | 2017-04-18 | 1 | -16/+30 |
| | |\ | | | | | | | | | HiKeyFastboot: reload partitionlist after flashing ptable | ||||
| | | * | HiKeyFastboot: reload partitionlist after flashing ptable | Vishal Bhoj | 2017-04-18 | 1 | -16/+30 |
| | |/ | | | | | | | | | | | | | | | | | | | Fixes: https://bugs.96boards.org/show_bug.cgi?id=495 Change-Id: I04f574f05d3b0f45a27f255afc9022fc003a5994 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org> | ||||
* | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵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-release | Dmitry Shmidt | 2016-10-26 | 2 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 911a23ccd8 am: 6f399d2f9b am: 314cdb0db6 am: a3d5024960 Change-Id: I1b3274e93e6682db6e6910febfef60d4d24a749e | ||||
| * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2 | Dmitry Shmidt | 2016-10-26 | 2 | -0/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 911a23ccd8 am: 6f399d2f9b am: 314cdb0db6 Change-Id: I2f1b294680b6d665eff37bdb456e93b50b5f2e08 | ||||
| | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 911a23ccd8 | Dmitry Shmidt | 2016-10-26 | 2 | -0/+3 |
| |/| | | | | | | | | | | | | | | | | | | | | | | am: 6f399d2f9b Change-Id: Idfef5e9847947ae936c7f7885aa27a421d9557dc | ||||
| | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppandroid-o-preview-1o-preview | Dmitry Shmidt | 2016-10-26 | 2 | -0/+3 |
| |/| | | | | | | | | | | | | | | | | | | | | | | am: 911a23ccd8 Change-Id: I5cf0084230838f43eea342d0083f649b3a0fc5f6 | ||||
| | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp | Dmitry Shmidt | 2016-10-26 | 2 | -0/+3 |
| | |\| | |||||
| | | * | Merge pull request #36 from johnstultz-work/hikey-aosp | Haojian Zhuang | 2016-10-26 | 2 | -0/+3 |
| | | |\ | | | | | | | | | | | HiKeyFastboot: Add short delay after flush to avoid reboot hang | ||||
| | | | * | HiKeyFastboot: Add short delay after flush to avoid reboot hang | John Stultz | 2016-10-25 | 2 | -0/+3 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've frequently seen hangs after flashing partitions on HiKey. It tends to happen when the flash and reboot commands happen very close together: $ fastboot flash <partition> <image>; fastboot reboot; Tracing through this, the Flush completes, and then we process the fastboot reboot command, which issues the PSCI_RESET command and we seem to hang in PSCI_RESET. This seems to point to some sort of a hardware issue where the RESET command may not actually trigger the hardware to reset if there's some sort of IO still in flight. The flush command shouldn't return early, but something is not quite right here. In order to avoid the issue, this patch adds a short delay after the flush command. With this delay, I can no longer trigger the reset hang. Change-Id: I9ccbcdcc597c4546808777c06ecd3f252df15008 Signed-off-by: John Stultz <john.stultz@linaro.org> | ||||
* | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵ | Dmitry Shmidt | 2016-08-31 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da41388f7d am: 62941329a1 am: 1a17964e48 am: a3f92afeeb Change-Id: Ie2efbd1f7af02bd0459748dd5997f5844c82c91a | ||||
| * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵ | Dmitry Shmidt | 2016-08-30 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da41388f7d am: 62941329a1 am: 1a17964e48 Change-Id: Id347417c1be55054ee8a83de19a2afa50b449546 | ||||
| | * \ \ | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: da41388f7d | Dmitry Shmidt | 2016-08-30 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 62941329a1 Change-Id: I66981bd89a28a754600e05860fbf5a3eab63e322 | ||||
| | | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp | Dmitry Shmidt | 2016-08-30 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: da41388f7d Change-Id: Ib4bf4898677fb3275c6ad228277cae5554319258 | ||||
| | | | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp | Dmitry Shmidt | 2016-08-30 | 1 | -1/+1 |
| | | | |\| | |||||
| | | | | * | Merge pull request #35 from hzhuang1/firmware_vendor | Haojian Zhuang | 2016-08-30 | 1 | -1/+1 |
| | | | | |\ | | | | | | | | | | | | | | | hikey: Change PcdFirmwareVendor to "hikey" | ||||
| | | | | | * | hikey: Change PcdFirmwareVendor to "hikey" | Dmitry Shmidt | 2016-08-30 | 1 | -1/+1 |
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ fastboot getvar product - should be consistent with ro.product.device value that is set from the build. Change-Id: Ia4add81903b700d8b22d297b05d76b801c6ea0df Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> | ||||
* | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵ | Dmitry Shmidt | 2016-08-25 | 1 | -0/+39 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15efc9efd6 am: 261537f6ca am: 6e1dee2899 am: 900cf0c6d0 Change-Id: I6aa0d57ae3c849bb0621eb5a7055042cc49428bf | ||||
| * | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵ | Dmitry Shmidt | 2016-08-25 | 1 | -0/+39 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15efc9efd6 am: 261537f6ca am: 6e1dee2899 Change-Id: I5047c38c81eeec54d116f4982f355a8348ee5228 | ||||
| | * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 15efc9efd6 | Dmitry Shmidt | 2016-08-25 | 1 | -0/+39 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 261537f6ca Change-Id: I7982ca5c7bf272aad8992a6d3efa9b62f4ccc749 | ||||
| | | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp | Dmitry Shmidt | 2016-08-25 | 1 | -0/+39 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 15efc9efd6 Change-Id: I9faf2ba2dc35d01273a521c7479e473821a170b5 | ||||
| | | | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp | Dmitry Shmidt | 2016-08-25 | 1 | -0/+39 |
| | | |/| | | | | | |/ | |||||
| | | | * | Merge pull request #33 from liuyq/hikey-aosp | Haojian Zhuang | 2016-08-25 | 1 | -0/+22 |
| | | | |\ | | | | | | | | | | | | | HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILL | ||||
| | | | | * | HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILL | Yongqin Liu | 2016-08-25 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since the sparse image generated with img2simg command will have CHUNK_TYPE_FILL type trunk, and it's better to have support for that, so that we can try other file system type with img2simg command. And we will ignore the FILL type chunk if it is filled with 0. If the it's not filled with 0, it will need more time to finish the flash Change-Id: I33ec90dbb0255b59cf5afcad67061fa7a89be106 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> | ||||
| | | | * | | Merge pull request #34 from hzhuang1/get_sn | Haojian Zhuang | 2016-08-25 | 1 | -0/+17 |
| | | | |\ \ | | | | | | | | | | | | | | | hikey: Add 'fastboot getvar serialno' support | ||||
| | | | | * | | hikey: Add 'fastboot getvar serialno' support | Dmitry Shmidt | 2016-08-25 | 1 | -0/+17 |
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbf21cf3a4ced908f91575c2e79d24d2555f9088 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> | ||||
| | | | * | | Merge pull request #32 from 96boards-hikey/revert-31-hikey-aosp | Haojian Zhuang | 2016-08-25 | 1 | -22/+0 |
| | | | |\ \ | | | | | | | | | | | | | | | Revert "HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILL" | ||||
| | | | | * | | Revert "HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILL" | Haojian Zhuang | 2016-08-25 | 1 | -22/+0 |
| | | | |/ / | |||||
| | | | * | | Merge pull request #31 from liuyq/hikey-aosp | Haojian Zhuang | 2016-08-25 | 1 | -0/+22 |
| | | | |\ \ | | | | | |/ | | | | |/| | HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILL | ||||
| | | | | * | HiKeyFastboot.c: add support for sparse image with CHUNK_TYPE_FILL | Yongqin Liu | 2016-08-25 | 1 | -0/+22 |
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since the sparse image generated with img2simg command will have CHUNK_TYPE_FILL type trunk, and it's better to have support for that, so that we can try other file system type with img2simg command. And we will ignore the FILL type chunk if it is filled with 0. If the it's not filled with 0, it will need more time to finish the flash Change-Id: I33ec90dbb0255b59cf5afcad67061fa7a89be106 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> | ||||
| | | | * | Merge pull request #30 from hzhuang1/sn17 | Haojian Zhuang | 2016-08-18 | 1 | -1/+4 |
| | | | |\ | | | | | | | | | | | | | HiKey: change the serial number length to 17 | ||||
| | | | | * | HiKey: change the serial number length to 17 | Haojian Zhuang | 2016-08-18 | 1 | -1/+4 |
| | | | |/ | | | | | | | | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> | ||||
* | | | | | HiKey: change the serial number length to 17 am: 923d6aa9fe am: c98b539064 ↵ | Haojian Zhuang | 2016-08-19 | 1 | -1/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 698f96bb00 am: f4c81bfb6b Change-Id: I756732177cfb183edb6683154cde0ea53d06d112 | ||||
| * | | | | HiKey: change the serial number length to 17 am: 923d6aa9fe am: c98b539064 | Haojian Zhuang | 2016-08-19 | 1 | -1/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 698f96bb00 Change-Id: Id5ada393d77840f0e146944a4081e8e15cb2e5e3 | ||||
| | * | | | HiKey: change the serial number length to 17 am: 923d6aa9fe | Haojian Zhuang | 2016-08-19 | 1 | -1/+4 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c98b539064 Change-Id: I2303b1fe6518176b7dd935161221614db3e8a92a | ||||
| | | * | | HiKey: change the serial number length to 17 | Haojian Zhuang | 2016-08-19 | 1 | -1/+4 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 923d6aa9fe Change-Id: I9d566d9a46c3346e77f21e49c0cfae2425010bad | ||||
| | | | * | | HiKey: change the serial number length to 17 | Haojian Zhuang | 2016-08-18 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> | ||||
* | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵ | Dmitry Shmidt | 2016-08-10 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0269b8d21b am: e0af4b9d20 am: 969ec85831 am: df3d06e50c Change-Id: I20c0a158ac047646fc38a8eaa69a09b484dabfc1 | ||||
| * | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: ↵ | Dmitry Shmidt | 2016-08-10 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0269b8d21b am: e0af4b9d20 am: 969ec85831 Change-Id: I02d0b11a73aa39ff8b1c213f50dc1045a8dcd8f9 | ||||
| | * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 0269b8d21b | Dmitry Shmidt | 2016-08-10 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e0af4b9d20 Change-Id: Iba0f982b5f62bed565b2e57cce69fccf157ab568 | ||||
| | | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp | Dmitry Shmidt | 2016-08-10 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0269b8d21b Change-Id: I0af820ffa03afff7f3e5571b20683a40fa664f7f |