summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-15Merge "Update GIFLIB to 5.1.4 DO NOT MERGE" into mnc-devTreeHugger Robot
2017-03-15Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 am: 9df4114375 -s ours am: 3e6f70a03a am: 61bde09c83 am: 91d92e11d7 am: c5faa6691b am: 6b2dede201 am: 0a5c930da6 -s ours Change-Id: Id0c991c87bde9bf30c809e0fb6685ad2e47ba544
2017-03-15Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 am: 9df4114375 -s ours am: 3e6f70a03a am: 61bde09c83 am: 91d92e11d7 am: c5faa6691b am: 6b2dede201 Change-Id: I2122fb0178df1e5fa29043cf112e624473ff4ecd
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 am: 9df4114375 -s ours am: 3e6f70a03a am: 61bde09c83 am: 91d92e11d7 am: c5faa6691b Change-Id: I7bc2ae5fd43db038fd03547823322e433c1fe8e8
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 am: 9df4114375 -s ours am: 3e6f70a03a am: 61bde09c83 am: 91d92e11d7 Change-Id: I2d8e07aafe3026cba5ef3486ce8680f7a6131eb6
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 am: 9df4114375 -s ours am: 3e6f70a03a am: 61bde09c83 Change-Id: I33b1dcc9b3a5a27d176c6d1e18d8c3d9721046e4
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 am: 9df4114375 -s ours am: 3e6f70a03a Change-Id: Ie497ea6f3f76f5fbd7c8348d51e5805bd6009351
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 am: 9df4114375 -s ours Change-Id: Ifc884a922050628f5d0f121e154903b91e8d60f7
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 am: ae38ad3b65 Change-Id: Ifbe5613d6f84ef0a720076f38a032b2a24ae45c6
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee am: 99f10c5f71 Change-Id: Id6f6d72fe62b56cf454208a5dc2df8359c14b4ae
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours am: 206e3e54ee Change-Id: I52cf5d3af06f24720df0434c0dff981b14d11143
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f am: c13e1d18d0 -s ours Change-Id: I048441ef548267e43ca6498c5ae1c422b3e4a843
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s ours am: ↵Leon Scroggins III
9136831f9c -s ours am: 8bfff4f29f Change-Id: I9c8efbc87cdcb71aaa1ffcf2e53179a9b6172b71
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGE am: 147ea0d6d7 -s oursLeon Scroggins III
am: 9136831f9c -s ours Change-Id: I9d5041729b571e491d60874b6a9340213a7c33ff
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGELeon Scroggins III
am: 147ea0d6d7 -s ours Change-Id: I00811cdbca475dd2617a77bc71ef6f966496f252
2017-03-14Include <limits.h> for SIZE_MAX DO NOT MERGELeon Scroggins III
Bug:34697653 Test: compile Though typically defined in stdint.h, Android defines SIZE_MAX in limits.h. Change-Id: I0f6fb89d9eb55406073d6b25e599bb2745253865
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6 -s ours am: a061a12398 am: bba06ee385 am: a731f0e9a2 am: cd957457b1 am: 41803ae6c1 am: 6cfda56c7d -s ours Change-Id: Ibbc03490a6ef73155d7f483e4a4426c119e39fd4
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 am: cd2f4359e0 -s ours am: 1ad4af259f am: 9f62ab4d69 am: 2377469a62 am: a503777abf am: f2a6ed92bd am: 785dda2113 -s ours Change-Id: I94b7eba2a649c994661fe9c9bc500b6dfbb115d9
2017-03-14resolve merge conflicts of c1786d9 to nyc-mr2-dev-plus-aospLeon Scroggins III
am: 33f878e410 -s ours Change-Id: I04c5449803f55d3e26bbc979d998db0802560f07
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6 -s ours am: a061a12398 am: bba06ee385 am: a731f0e9a2 am: cd957457b1 am: 41803ae6c1 Change-Id: I71e138c110c082b604603c12db4603af5e658e87
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 am: cd2f4359e0 -s ours am: 1ad4af259f am: 9f62ab4d69 am: 2377469a62 am: a503777abf am: f2a6ed92bd Change-Id: Ibee7f62a1c27dfe44560628561c6b73c4d667058
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6 -s ours am: a061a12398 am: bba06ee385 am: a731f0e9a2 am: cd957457b1 Change-Id: Ib11f6ded52358ef5b931bbd3911b2bdf85266a20
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6 -s ours am: a061a12398 am: bba06ee385 am: a731f0e9a2 Change-Id: I0a726119237c79bc7af341366e4e7a80c18b4ed7
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6 -s ours am: a061a12398 am: bba06ee385 Change-Id: I0081380e9bedaf6fb4edbbbc6c60dcc67dadb885
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6 -s ours am: a061a12398 Change-Id: I35e0cfc2a91578f534c4a89cc42a270ac96a9c56
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 am: dbb35363d6 -s ours Change-Id: I5018d4e4fa95046e055ca8120b0c573cccc8e4d8
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 am: e23a47e314 Change-Id: Ida14089d383d8dce961f7e3719573e6721331e2e
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 am: bd0b73df80 Change-Id: I4dc96394b32ff12228b4e2da40a93ebebf200b6c
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours am: d78574c965 Change-Id: I410ca7ab26a5b7f999c79c6ed783fcba199fcb36
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a am: 38f16f10ff -s ours Change-Id: I67646d06823ec0960815680d1f86f95f17343511
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours am: d7675e2f7a Change-Id: Ibb872a44835ff403addc1c5042b67840ab7facd5
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041 am: ↵Leon Scroggins III
34ed144918 -s ours am: 8a8b99f07b -s ours Change-Id: I7cf81ae4713c04cc76489e705b36955c557cee08
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654a am: 398d936041Leon Scroggins III
am: 34ed144918 -s ours Change-Id: I82ff7507faf378744df0eb13dd1e2b65fe907399
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: b95e3f654aLeon Scroggins III
am: 398d936041 Change-Id: I80be8771d2b6a12eecb9f4204e7eeebc53ab106a
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGELeon Scroggins III
am: b95e3f654a Change-Id: I6b1154f0d234b48975e1e18a27fa267be8c498b5
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 am: cd2f4359e0 -s ours am: 1ad4af259f am: 9f62ab4d69 am: 2377469a62 am: a503777abf Change-Id: I44feef3f693d5d9978859303ce516a53f73ce047
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 am: cd2f4359e0 -s ours am: 1ad4af259f am: 9f62ab4d69 am: 2377469a62 Change-Id: I4aab842a4953721570233e88951a00da541bfdf4
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 am: cd2f4359e0 -s ours am: 1ad4af259f am: 9f62ab4d69 Change-Id: Ica088410755d47dc5ebb6a2eb4a31782eabf5c57
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 am: cd2f4359e0 -s ours am: 1ad4af259f Change-Id: I8b559f48fcc9ef9779bb8ded2ab3fd32076b0d42
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 am: cd2f4359e0 -s ours Change-Id: I39f8697727bb6afca142db734af5459b2762851c
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab am: 1813909837 Change-Id: I4fe6f9f92009894ef7f97beda60799b4e1ed87e2
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s ours ↵Leon Scroggins III
am: 54529030eb am: 271553a9ab Change-Id: I069bd42b0eb77768fba125b20a2875521d647682
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694e am: b9d1aac7b6 -s oursLeon Scroggins III
am: 54529030eb Change-Id: Ia834d505a5d7432cb4f6f75fca98a05eaa222126
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 160402694eLeon Scroggins III
am: b9d1aac7b6 -s ours Change-Id: I895359bc5ed33ba0efd31870c207c5188701abf4
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGELeon Scroggins III
am: 160402694e Change-Id: I772c36a2f7550d08272db1eaf8b0981be394b680
2017-03-14resolve merge conflicts of c1786d9 to nyc-mr2-dev-plus-aospLeon Scroggins III
Bug:34697653 Test: compile; existing CTS tests Conflicts: Android.mk Android.mk has been replaced by Android.bp. Modify .bp to have the same change as .mk Change-Id: I9abc5b6d382b573ff4b62979fde7af3661da5930
2017-03-14Merge "Update GIFLIB to 5.1.4 DO NOT MERGE" into nyc-dev am: 7c9485395e am: ↵Leon Scroggins III
ffdc6e5809 am: 1ef8a3cc32 am: 8d3f9ed1f7 Change-Id: Ie70c9faf8fcecd22a9c3935199a590f3ccc59a60
2017-03-14Merge "Update GIFLIB to 5.1.4 DO NOT MERGE" into nyc-dev am: 7c9485395e am: ↵Leon Scroggins III
ffdc6e5809 am: 1ef8a3cc32 Change-Id: Ifd3cbcc06a85847c737cc857fb8944f950f07543
2017-03-14Merge "Update GIFLIB to 5.1.4 DO NOT MERGE" into nyc-dev am: 7c9485395eLeon Scroggins III
am: ffdc6e5809 Change-Id: Ibfdf551de3abaa473ea25e6a2aaaddf84c789932
2017-03-14Update GIFLIB to 5.1.4 DO NOT MERGE am: 75c90ad75c -s ours am: fcb372c282 ↵Leon Scroggins III
am: 7998de9149 -s ours am: d7a50967ff am: 301b8f1180 am: cb0795e294 am: 23053275eb -s ours am: 48f08e868d am: 3bc10ac120 am: 41e3a5af5a am: 536f0da4d4 am: 4872f67838 am: a8cf219774 -s ours Change-Id: Ibd206d19b22779110cbd3cb3f451a8cf58c27d7b