summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge cherrypicks of [3276508, 3277765, 3277766, 3277904, 3276473, 3278009, ↵android-wear-8.1.0_r1android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-build-team Robot2017-11-271-0/+14
|\ | | | | | | | | | | 3278010, 3277767, 3277768, 3277769, 3277770, 3276509, 3276510, 3278011, 3278012, 3278013, 3278014, 3278099, 3278100, 3278101, 3278102, 3278103, 3278104, 3278105, 3278106, 3277800, 3276474, 3278015, 3278016, 3278017, 3278118, 3278119, 3278120, 3278121, 3278122, 3277946, 3277905, 3277947, 3277906, 3277751, 3278123, 3277752, 3278110, 3277771, 3277907, 3278095, 3277908, 3278111, 3277772, 3276475, 3276476] into oc-mr1-release Change-Id: Ifa8110f04f5c0940ec625f48d536bfccb3613183
| * libnetutil: Check dhcp respose packet lengthtintin2017-11-271-0/+14
|/ | | | | | | | | Bug: 67474440 Test: Manual Change-Id: I84b533f0101a56ec01e64c7591f3c7e82f513b2e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> (cherry picked from commit 61f25d4a3657e79659963d12005afa8c30883015)
* Snap for 4407597 from fdd67a54ec43b47616893f8138d6d7029d14513b to oc-mr1-releaseandroid-cts-8.1_r1android-8.1.0_r1android-build-team Robot2017-10-200-0/+0
|\ | | | | | | Change-Id: I3ccb24d6758cdfba1e68ee97b4142e832df804fe
| * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 am: 7fe7bce52f am: d07ba77e60 -s ours am: fb1a14ad59 am: c184678b7a Change-Id: I6d55e4c9dc4fcaf069596437006210c47bc512f7
| | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 am: 7fe7bce52f am: d07ba77e60 -s ours am: fb1a14ad59 Change-Id: I64a827480c5b0be20d1e7972853f7fcbac6171b8
| | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 am: 7fe7bce52f am: d07ba77e60 -s ours Change-Id: I1f7f0cfa5b5f550dc2850a1845734e3ef5ee6929
| | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 am: 7fe7bce52f Change-Id: I500587ac26d3b5420598520ee196cf696b39f4f9
| | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 Change-Id: I42e59e67fec69f487fdffed07f84625714a58eaa
| | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 Change-Id: I6b01dd2fa72261126be178f521c74576e6221f0e
| | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded Change-Id: I9a51f837432346064b4faf84a634e85e492debcf
| | | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours Change-Id: Iaa25cd6dda9e9fbc47467688f3b4d7c00b632703
| | | | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 Change-Id: I20c27db686870c2ac0d383e1646040f9ddf089ed
| | | | | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d Change-Id: I94da1d7773bdac11b517a604296e2e7862cc9041
| | | | | | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a Change-Id: I5c7c636e60cde0b865e0392b2c6e024a97887449
| | | | | | | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bfe4b5edb3 -s ours am: e1257bad6e -s ours Change-Id: I3f620ab28867fff2f2aba713e9031936e965c68e
| | | | | | | | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e.Narayan Kamath2017-10-040-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bfe4b5edb3 -s ours Change-Id: I52be163235ae281a263e75ae499b39e44e9f880f
| | | | | | | | | | | | | | * DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e.Narayan Kamath2017-09-201-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no functional changes here. This is in place to make merge conflicts less likely if any further changes are made to this code in the future. Test: make Test: zip_archive_test Bug: 64211847 Change-Id: I80ff9712c85d602d27f132ac54f62b3524ac9106
| * | | | | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 am: 5995e741e5 am: bc5fc101ad -s ours am: b1f99e94d8 am: b29e9fecfe Change-Id: I542f159a18d1d555260ca17ef00da7024c705e7f
| | * | | | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 am: 5995e741e5 am: bc5fc101ad -s ours am: b1f99e94d8 Change-Id: I0a00404d10c78c1cd6e119d6337dee0a1c579a55
| | | * | | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 am: 5995e741e5 am: bc5fc101ad -s ours Change-Id: I416210e446828495b6b0db054b77e15a8b1dd731
| | | | * | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 am: 5995e741e5 Change-Id: I8ad269b877b307eb104f7b749ad728b931dd0aa2
| | | | | * | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 Change-Id: I781301b38e5dd172c10cca10fbae831530440ca1
| | | | | | * | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 Change-Id: Id94ff7eba5c127d1c6ac4dcadf09c9e7e4ad6bc1
| | | | | | | * | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a Change-Id: Ie4c3f2fb73b4b64c9fa70e7cd7c09a5449600691
| | | | | | | | * | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours Change-Id: I8884dd090583f0e089830410e6a00c4c49e6b43c
| | | | | | | | | * | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f Change-Id: Ic60afdb3082fe5d24057407dc2810e552bb8c7dd
| | | | | | | | | | * | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 951b0dccf0 am: 6e598b9e9d Change-Id: I0ad76feb073074ec935ac49de8a2af55d48932bc
| | | | | | | | | | | * | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s oursNarayan Kamath2017-10-190-0/+0
| | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 951b0dccf0 Change-Id: Ib8125c31898b27cfa6607c3cb3ec820c290dfe99
| | | | | | | | | | | | * | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1.Narayan Kamath2017-10-190-0/+0
| | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: eeb93c9a64 -s ours Change-Id: I57cebdb9a67a42ce8f37288768c7778406a6289e
| | | | | | | | | | | | | * | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1.Narayan Kamath2017-09-202-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make Test: zip_archive_test Bug: 64211847 (cherry picked from commit 547c7d9a0b6651ace0ade7849661ba6c20770ae6) (cherry picked from commit bfe4b5edb3097df66ddbf9639c3b3cd290734ed8) Change-Id: Ide48ce66542e152d88520dcd6abcd104e48137f6
| * | | | | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d am: 79f474a679 -s ours am: c26850c970 am: 8085ab4ec5 Change-Id: I7f0d7d7b84fc26d8c2bae371337a63bcaacf003c
| | * | | | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d am: 79f474a679 -s ours am: c26850c970 Change-Id: I4445bafd1e1a2ef81300823dfa9023bb68ada5f4
| | | * | | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d am: 79f474a679 -s ours Change-Id: I31ef016a5e85f365e0aa297fe37c65d2a391071b
| | | | * | | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d Change-Id: I3d8210eaa9dffa9f94abd9be4ff43b9f6d57d4b8
| | | | | * | | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 Change-Id: I0724657c65dcd16956e52429d0cc646007b07273
| | | | | | * | | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 Change-Id: I08886c30fdabfd59f5a75279e70ec74fc26b2d0b
| | | | | | | * | | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e Change-Id: I96387e1276c9f383c1ed463398226129d58364f7
| | | | | | | | * | | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours Change-Id: I6047b1af5b0ac1ee29d512392bbfe7fd3d161e06
| | | | | | | | | * | | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a Change-Id: Iaa35c4240a11ccba54f88e47e44696210403d3e6
| | | | | | | | | | * | | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 Change-Id: I808da09dc5496d2cc3471fa3de6c083c80d038b4
| | | | | | | | | | | * | | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ↵Narayan Kamath2017-10-190-0/+0
| | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 4732ec6440 -s ours am: 59c7fe7a39 Change-Id: I9a490f299bcbd250b4266888dab733b0107bf74f
| | | | | | | | | | | | * | | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s oursNarayan Kamath2017-10-190-0/+0
| | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4732ec6440 -s ours Change-Id: Ib875d2d8f81a2ecd84e329a7a005dddccbb88d84
| | | | | | | | | | | | | * | DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1.Narayan Kamath2017-09-140-0/+0
| | | | | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 547c7d9a0b -s ours Change-Id: I7161f648e78ece5d8ee8b5c73be49e5a52f01b7b
| | | | | | | | | | | | | | * DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1.Narayan Kamath2017-09-142-31/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make Test: zip_archive_test Bug: 64211847 Change-Id: Ide48ce66542e152d88520dcd6abcd104e48137f6
| * | | | | | | | | | | | | | Merge "zip_archive: reject files that don't start with an LFH signature." ↵Narayan Kamath2017-10-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 am: 3cee49d066 Change-Id: I374edb225ac3ab6fee65a9b3f7fe0ac86e6f5656
| | * | | | | | | | | | | | | Merge "zip_archive: reject files that don't start with an LFH signature." ↵Narayan Kamath2017-10-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 Change-Id: Id60bdf2f11342bde648f79bad64ef434f3c9460f
| | | * | | | | | | | | | | | Merge "zip_archive: reject files that don't start with an LFH signature." ↵Narayan Kamath2017-10-190-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df Change-Id: Iebb2829c8c285953a056ac2ecef682ae9485b643
| | | | * | | | | | | | | | | Merge "zip_archive: reject files that don't start with an LFH signature." ↵Narayan Kamath2017-10-190-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 Change-Id: I44f0e220da67fc29369ba1a01a89dd10627d5f85
| | | | | * | | | | | | | | | Merge "zip_archive: reject files that don't start with an LFH signature." ↵Narayan Kamath2017-10-190-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 Change-Id: I5b6f9a34fe64bbeab02fca9f37d5ddca138ce89a
| | | | | | * | | | | | | | | Merge "zip_archive: reject files that don't start with an LFH signature." ↵Narayan Kamath2017-10-190-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 Change-Id: Idb4181f57f78ab4afbf8df3735897347d7effe5d