 gitbuildkicker
|
331ca99a6a
|
merge in oc-release history after reset to master
|
2017-01-22 00:07:14 -08:00 |
|
 Tao Bao
|
f21b6c0d1d
|
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48 am: 6a82bc228a
am: 8157166107
Change-Id: I122904cb52fa214dba468e43afb17e55aafd0039
|
2017-01-20 20:27:43 +00:00 |
|
|
Tao Bao
|
8157166107
|
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48
am: 6a82bc228a
Change-Id: I8e1687131deca82302246fd4f05d0f6e48c5301f
|
2017-01-20 20:24:43 +00:00 |
|
|
Tao Bao
|
6a82bc228a
|
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656
am: ca261d3b48
Change-Id: I0278ded6acb4c003c65cb6b71b7b52a7824fe2fc
|
2017-01-20 20:22:13 +00:00 |
|
|
Tao Bao
|
ca261d3b48
|
Merge "imgpatch: Compile with ZLIB_CONST defined."
am: e78ca37656
Change-Id: I636cfadd456cb6e256049a23f70e3a7a71c70d78
|
2017-01-20 20:19:44 +00:00 |
|
|
Tao Bao
|
e78ca37656
|
Merge "imgpatch: Compile with ZLIB_CONST defined."
|
2017-01-20 20:15:57 +00:00 |
|
|
Tao Bao
|
087bc0c7d3
|
imgpatch: Compile with ZLIB_CONST defined.
So z_stream.next_in takes pointer to const data.
Test: mmma bootable/recovery/applypatch
Change-Id: If269b766a7c84fa2f67424ee61ba5afab0159261
|
2017-01-20 12:13:28 -08:00 |
|
 Tianjie Xu
|
3735bb6d38
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 am: e4dcbd1c9e
am: 9af09c0505 -s ours
Change-Id: I4701616a9c3d5e7237e23942ffdf05d696b61d6e
|
2017-01-20 05:41:38 +00:00 |
|
|
Tianjie Xu
|
3337819ff2
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254 am: 87f49b83ca
am: 85bb15a4e5 -s ours
Change-Id: I40db1874f3ec2176b39350a04d95a6fa4018882d
|
2017-01-20 05:41:26 +00:00 |
|
|
Tianjie Xu
|
9af09c0505
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254
am: e4dcbd1c9e
Change-Id: Ib2b4830318c7d6d1303d5ee5efdc49caaaba8836
|
2017-01-20 04:25:42 +00:00 |
|
|
Tianjie Xu
|
85bb15a4e5
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254
am: 87f49b83ca
Change-Id: Ib02c4fddda47bae1c082df0502e94ad7cd3b0417
|
2017-01-20 04:18:28 +00:00 |
|
|
Tianjie Xu
|
87f49b83ca
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc
am: 99e38bf254
Change-Id: Id8c4d672f5edbe5b12efa8350588ae088bbe595b
|
2017-01-20 04:08:42 +00:00 |
|
|
Tianjie Xu
|
e4dcbd1c9e
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc
am: 99e38bf254
Change-Id: I3ba0b154e71535e0528c0117728c3b1fee0f20d3
|
2017-01-20 04:08:41 +00:00 |
|
|
Tianjie Xu
|
99e38bf254
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733
am: 8e267878cc
Change-Id: I5cff676ac1b93c413cd8b339d7cf62ca7fbc650f
|
2017-01-20 04:05:42 +00:00 |
|
|
Tianjie Xu
|
8e267878cc
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8
am: 3d1f19c733
Change-Id: I4c3c665cb6aac08125817f26d788f9fb82b3ca92
|
2017-01-20 04:02:10 +00:00 |
|
|
Tianjie Xu
|
3d1f19c733
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours
am: 510b13acd8
Change-Id: I4b0f915faac915a11917ebc8291de0ba782dd76b
|
2017-01-20 03:53:17 +00:00 |
|
|
Tianjie Xu
|
510b13acd8
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456
am: 0a627e5a5f -s ours
Change-Id: I503597404e665b723337ee56a46c719890a547a1
|
2017-01-20 03:38:14 +00:00 |
|
|
Tianjie Xu
|
0a627e5a5f
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2
am: 9930b28456
Change-Id: Ib4853ac0b4f56534130a6b40fbe4ea1a95131cca
|
2017-01-20 03:23:12 +00:00 |
|
|
Tianjie Xu
|
9930b28456
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c
am: d1c3bdd8c2
Change-Id: I8dbfd452ad4bae3374efa7395b8189db00cdfbe1
|
2017-01-20 03:08:41 +00:00 |
|
|
Tianjie Xu
|
d1c3bdd8c2
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours
am: 457ad2dc3c
Change-Id: Ic6e056e6a50066eb6d123b150e928533633f96e0
|
2017-01-20 02:55:39 +00:00 |
|
|
Tianjie Xu
|
457ad2dc3c
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a
am: 0d750f900b -s ours
Change-Id: Iaab9c0e9d8e5a5198bcad373d229915c6bc62c79
|
2017-01-20 02:43:07 +00:00 |
|
|
Tianjie Xu
|
0d750f900b
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours
am: 8bdb13dd9a
Change-Id: Ieb6efb9b8efec556f401325fb8449e56b2f9d4bc
|
2017-01-20 02:35:07 +00:00 |
|
|
Tianjie Xu
|
8bdb13dd9a
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours
am: 3591cb48f5 -s ours
Change-Id: I173c8f1c1f68b57b3046f91525c5ac3d3acf184d
|
2017-01-20 02:26:06 +00:00 |
|
|
Tianjie Xu
|
3591cb48f5
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev
am: 4eb997d52b -s ours
Change-Id: If5c4537e910fffddd757be2a80ca9c949e93ed93
|
2017-01-20 02:19:36 +00:00 |
|
|
Tianjie Xu
|
4eb997d52b
|
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev
Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15
|
2017-01-19 16:18:31 -08:00 |
|
 Sen Jiang
|
f5247e381a
|
Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6 am: f859652e5f
am: a727d151d4
Change-Id: Ia0c4c77f05484fe625dd5ecb4eaa0234f9dcefcb
|
2017-01-19 20:57:43 +00:00 |
|
|
Sen Jiang
|
a727d151d4
|
Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6
am: f859652e5f
Change-Id: I67af664a5da8d4ceea827542d5b82e30e08c4984
|
2017-01-19 20:55:43 +00:00 |
|
|
Sen Jiang
|
f859652e5f
|
Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004
am: 9bb0819ef6
Change-Id: I913d4350db0003aba9d995ef01340d6fba417c6b
|
2017-01-19 20:52:43 +00:00 |
|
|
Sen Jiang
|
9bb0819ef6
|
Merge "imgdiff: cache bsdiff suffix array in zip mode."
am: 37bda6a004
Change-Id: I444a0b2245ed72cd874f734a354feb2eb51e4b5a
|
2017-01-19 20:50:13 +00:00 |
|
|
Sen Jiang
|
37bda6a004
|
Merge "imgdiff: cache bsdiff suffix array in zip mode."
|
2017-01-19 20:45:27 +00:00 |
|
|
Tianjie Xu
|
444732f7a0
|
Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb am: 18098b7de3
am: 98cf72d3aa
Change-Id: I1fb6b0898d347ca1187241e495fe28b260c6d905
|
2017-01-19 19:28:37 +00:00 |
|
|
Tianjie Xu
|
98cf72d3aa
|
Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb
am: 18098b7de3
Change-Id: I640596adfbe3a345c0780d56b62ea6f9eb2b17f2
|
2017-01-19 19:26:06 +00:00 |
|
|
Tianjie Xu
|
18098b7de3
|
Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9
am: a38224eadb
Change-Id: I76d7bafedec04bbbb4f5473f61c69333e2a6d25a
|
2017-01-19 19:23:36 +00:00 |
|
|
Tianjie Xu
|
a38224eadb
|
Merge "Add checkers and tests for empty locale in PNG file"
am: 69e73ab7a9
Change-Id: Ie7f4dd37a6dbe08ced5c8735fb03af4601bc8f88
|
2017-01-19 19:20:36 +00:00 |
|
|
Tianjie Xu
|
69e73ab7a9
|
Merge "Add checkers and tests for empty locale in PNG file"
|
2017-01-19 19:17:18 +00:00 |
|
|
Tianjie Xu
|
30ebad41c6
|
Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aosp
am: 8a6139a9e8 -s ours
Change-Id: I6a4a55ea154a6e144a6fe910c1377decbfc0838f
|
2017-01-19 19:10:17 +00:00 |
|
|
Tianjie Xu
|
762992a26a
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477
am: 5403bdced4 -s ours
Change-Id: I98e8158e2559ba541ba18107c235242941989a5c
|
2017-01-19 19:10:16 +00:00 |
|
|
Tianjie Xu
|
073a2fffae
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: de530474e9
am: 0058ef2cec -s ours
Change-Id: I72dbbcd840da2f0c8493bebbac57b37f0256430f
|
2017-01-19 19:10:04 +00:00 |
|
 Android Build Merger (Role)
|
8a6139a9e8
|
Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aosp
|
2017-01-19 19:07:42 +00:00 |
|
|
Tianjie Xu
|
5403bdced4
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66
am: 4aa56ad477
Change-Id: Ife96e05de25d6feba52958f7c927285cea411ca6
|
2017-01-19 19:07:35 +00:00 |
|
|
Tianjie Xu
|
0058ef2cec
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66
am: de530474e9
Change-Id: I9d78ead6684f04b84cfaba81f2e8a7b09ed35f3f
|
2017-01-19 19:07:35 +00:00 |
|
|
Tianjie Xu
|
4aa56ad477
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4
am: d0bfa33c66
Change-Id: I73459eeb26653773edcf10209531f397e40d2c03
|
2017-01-19 19:05:05 +00:00 |
|
|
Tianjie Xu
|
de530474e9
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4
am: d0bfa33c66
Change-Id: I65685b89b6e1c3d7adae8c24a554d680aa026408
|
2017-01-19 19:05:05 +00:00 |
|
|
Tianjie Xu
|
d0bfa33c66
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9
am: 8953f919e4
Change-Id: Ibe82fdacb0c2ee8214e3d9038ef9751f8d1315ad
|
2017-01-19 19:02:35 +00:00 |
|
|
Tianjie Xu
|
8953f919e4
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6
am: 8f9e3c9bd9
Change-Id: I83fa019edb9771cf799e691c9b6637aec75a4cc4
|
2017-01-19 19:00:11 +00:00 |
|
|
Tianjie Xu
|
8f9e3c9bd9
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours
am: 67b69c05c6
Change-Id: I32c16f13987f4b1b1c46af948c1a724d8225c0cc
|
2017-01-19 18:57:35 +00:00 |
|
|
Tianjie Xu
|
67b69c05c6
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386
am: 8a51334062 -s ours
Change-Id: I7f2969a4bd8192f2c700945a493d2c32af91af70
|
2017-01-19 18:55:04 +00:00 |
|
|
Tianjie Xu
|
8a51334062
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a
am: b21b92b386
Change-Id: I30cc5605866bc087fc6afdad2b2d7e033cd2f25e
|
2017-01-19 18:52:33 +00:00 |
|
|
Tianjie Xu
|
b21b92b386
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440
am: ddca75fb0a
Change-Id: I8010afacf2d0299715cb3b11b81f31d6baca1083
|
2017-01-19 18:50:33 +00:00 |
|
|
Tianjie Xu
|
ddca75fb0a
|
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours
am: 37a5941440
Change-Id: I87b102e92e9ee2bc49af6b7c8ec4d0a48894f732
|
2017-01-19 18:48:03 +00:00 |
|