review.tizen.org Git - platform/upstream/VK-GL-CTS.git/log

Kalle Raita [Tue, 22 Aug 2017 20:29:08 +0000 (20:29 +0000)]

CP: Remove two read-backs from copy image tests am: 263e135474 am: 15f98c4682 am: 1e01d9996c am: 46a71ac84b am: 55222675a2 am: 8c8ba6b6e7 am: bd239739e4
am: 873898d4b0

Change-Id: I08d179485b5ceb219c5ecb04f94659d93e9853f0

commit | commitdiff | tree

Kalle Raita [Tue, 22 Aug 2017 20:28:56 +0000 (20:28 +0000)]

CP: Non-compressed copy image target size (64,64,8 am: 7aff1a044f am: 0a8b1151da am: 7e383871b1 am: a49a3b9496 am: db0570a3fb am: 6626543a3a am: 6050c77b48
am: f80019343b

Change-Id: I721301af93caa8356d773e4321d4ab6d89ee5f94

commit | commitdiff | tree

Kalle Raita [Tue, 22 Aug 2017 20:28:24 +0000 (20:28 +0000)]

CP: Remove two read-backs from copy image tests am: 263e135474 -s ours am: 462575748a am: 86e2ff7051 am: 33eec04a9a am: 9c27db80ef
am: c9244da7c9

Change-Id: Ibd814c66c30f29ccb66e4293bc288a0ab502ad97

commit | commitdiff | tree

Kalle Raita [Tue, 22 Aug 2017 20:28:00 +0000 (20:28 +0000)]

CP: Non-compressed copy image target size (64,64,8 am: 7aff1a044f am: 8bb21c1262 am: c080a2efba am: 0670d1bd72 am: 54a9810ee1
am: f359e01ac7

Change-Id: If658cd17078100499c490df5009ac70c7229d605

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:27:34 +0000 (20:27 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53 -s ours am: fd5c16b5cc -s ours am: 8b23a3675e -s ours
am: cc956d5af9 -s ours

Change-Id: Idb7215a99963eff80f0aaa826a46c42b69fed74d

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:26:55 +0000 (20:26 +0000)]

Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34 -s ours am: d8fcc99946 -s ours am: afa9925458 -s ours
am: 53e4033507 -s ours

Change-Id: I5b2b53076638a1eb9cb1c43ee9f0d4554dd1a191

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:26:23 +0000 (20:26 +0000)]

Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220 am: cb5a254427 am: bcd9ecefa9
am: 4662208829

Change-Id: I4bc3ec32c475fded78bbe87f0191101088091210

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 20:25:52 +0000 (20:25 +0000)]

Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc am: afc69d0dd1 am: 0e3f2fcb41 am: fa5e828111
am: 9055b0aac5

Change-Id: I054b985a97409b82a16f96597f4da58fb959c0d1

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:24:48 +0000 (20:24 +0000)]

Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: f3d81a3cd9 am: 3b0479c233 am: 0a2fdff220 am: d8355f769b am: 49858ea9f7 am: d4fbf4c6bb
am: 249c4337c7

Change-Id: I9cbfe2869f6e399895222b4f15e719d4001ced3a

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:24:28 +0000 (20:24 +0000)]

Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9 am: c29aba4a88 am: a9cd3623d3 am: 102133f902
am: 7842edb00c

Change-Id: I010e2d0054a5ead58995c37ef5baf2e6cf39b66f

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:24:11 +0000 (20:24 +0000)]

Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2 am: 930d6894e5 am: 02a44043d8 am: 36e6937809
am: b136c8668e

Change-Id: Ib2fc8904714a10b5b1f8720d1e8dff48129c058c

commit | commitdiff | tree

Nicolas Boichat [Tue, 22 Aug 2017 20:23:53 +0000 (20:23 +0000)]

Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed am: fc116aa764 am: 9e92f92f57 am: 0075efc88a
am: 9436a00607

Change-Id: I710a9445ac54af8364b4a42cf7835be273825ac0

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:23:36 +0000 (20:23 +0000)]

Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5 am: c9e3a51cd3 am: a87887160e
am: 444141f34c -s ours

Change-Id: Ie9a7ee1e1b320381a459a9fda5726c84d308bd8c

commit | commitdiff | tree

Kenneth Graunke [Tue, 22 Aug 2017 20:23:13 +0000 (20:23 +0000)]

Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27 am: ac112a3efa am: 4f51a66b4b
am: c796f582c8 -s ours

Change-Id: I63a56e945233e3e776051141c4040928fb20621b

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:22:43 +0000 (20:22 +0000)]

Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951 am: b7985f162a am: 4e37c3bcf2 am: 34555e78f1
am: c8124c1184

Change-Id: I3fe6fcb5ce8ad48add0016659cab38d5bf512c32

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:22:18 +0000 (20:22 +0000)]

Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8 am: acce97d998 am: dda77bf145 am: c08b02f568
am: 7a03ba225f

Change-Id: I5a2a1eb991df309068fffa5f49d2b396ec2de527

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:21:45 +0000 (20:21 +0000)]

Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: e19d6a6859 am: e0e2260a4a am: 222ef92210 am: c6747b082f am: 1a84cd74f0 am: ee8fb54633
am: a5fe056c67

Change-Id: Iacafecf55a168ded027bb8de97ee8f27ccfc6a9c

commit | commitdiff | tree

Kenneth Graunke [Tue, 22 Aug 2017 20:21:14 +0000 (20:21 +0000)]

Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: 6a6f549150 am: f9b870fb5b am: b47baae90a am: 76a7f607a5 am: bdbc876fc7" into nyc-mr2-dev-plus-aosp am: eed66f190e
am: cd2f7a60f9

Change-Id: I2a860ddfa96d9613f976f84dd5a1338efef8beb7

commit | commitdiff | tree

Kenneth Graunke [Tue, 22 Aug 2017 20:20:43 +0000 (20:20 +0000)]

Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: 6a6f549150 am: f9b870fb5b am: b47baae90a am: 76a7f607a5 am: bdbc876fc7 am: 517bc8386f
am: 112b6c5a69

Change-Id: Ic5fb002953590b41e90a69a4619274679c220817

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:20:14 +0000 (20:20 +0000)]

Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc am: 5f30178321 am: 764cd6e60b am: 0a683a56e7 am: e961416ca6 -s ours am: 8cddd0f806 -s ours" into nyc-mr2-dev-plus-aosp am: 54349c2293 -s ours
am: d1ce66946a -s ours

Change-Id: Icb23e3126e0ecf4c8cc9740e6c7843549b649ffc

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:19:38 +0000 (20:19 +0000)]

Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc am: 5f30178321 am: 764cd6e60b am: 0a683a56e7 am: e961416ca6 -s ours am: 8cddd0f806 -s ours am: 11baa951a3 -s ours
am: de04a2812a -s ours

Change-Id: I750cbf47934704fb2534045ff2df0180aa03b39d

commit | commitdiff | tree

Mark Adams [Tue, 22 Aug 2017 20:19:18 +0000 (20:19 +0000)]

Merge "Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95c7 am: 0624edb1ce am: 234daba7b4 -s ours am: 7f9e23d176 -s ours" into nyc-mr2-dev-plus-aosp am: 1fe7e3fe7c -s ours
am: d66143a1d0 -s ours

Change-Id: I087a3bbc5e84b0df2cc954f4ebcb750ef30326de

commit | commitdiff | tree

Mark Adams [Tue, 22 Aug 2017 20:19:00 +0000 (20:19 +0000)]

Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95c7 am: 0624edb1ce am: 234daba7b4 -s ours am: 7f9e23d176 -s ours am: d65e9700af -s ours
am: bc14bffa0b -s ours

Change-Id: I3635f6ace9531e9cb34327fb963f943b2f8b080a

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:18:44 +0000 (20:18 +0000)]

Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb -s ours am: 50df351a0f -s ours" into nyc-mr2-dev-plus-aosp am: 37b8c78167 -s ours
am: f870fb12f7 -s ours

Change-Id: Ic4ee609ee486d52df4e1168c2010018d9d28c7ff

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:18:26 +0000 (20:18 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb -s ours am: 50df351a0f -s ours am: fc588a0281 -s ours
am: 24371c5d2d -s ours

Change-Id: I62879bb73f6dda65caa1b16b6be6c8d212eb3ac4

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:17:46 +0000 (20:17 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df -s ours am: a4982bfb72 -s ours" into nyc-mr2-dev-plus-aosp am: 4b45e7bd91 -s ours
am: 0a44212786 -s ours

Change-Id: Ic6d2983615eba973b6a12ec9a54509420af1d76d

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:17:12 +0000 (20:17 +0000)]

Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df -s ours am: a4982bfb72 -s ours am: 22f1c94794 -s ours
am: 46144bbf64 -s ours

Change-Id: I99da23fc96ef2f176be8f90bd6762b69eb6e787a

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:16:41 +0000 (20:16 +0000)]

Merge "Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f" into nyc-mr1-dev-plus-aosp am: 715c4b7814" into nyc-mr2-dev-plus-aosp am: adf01af3de
am: 8e8c90ec5a

Change-Id: Ie71e61bac4bc13779fed78645c7aa391f6080d6b

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:16:11 +0000 (20:16 +0000)]

Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f" into nyc-mr1-dev-plus-aosp am: 715c4b7814 am: 2b9d5aeaed
am: efd459637b

Change-Id: Ifbccc95fa9680f6e60a05d4490e4b4e4d7b06d3d

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:15:41 +0000 (20:15 +0000)]

Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f am: 336f66bfc4" into nyc-mr2-dev-plus-aosp am: f91ebf94ee
am: 58b2d980ab

Change-Id: I409a88ace31615016f5794ceb2992a1c07dd800c

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:15:12 +0000 (20:15 +0000)]

Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f am: 336f66bfc4 am: b292b527a2
am: 34f90f1d46

Change-Id: I2fdaadd983cf92f9aa607a4351f343cbdd765d58

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 20:14:42 +0000 (20:14 +0000)]

Merge "Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84" into nyc-mr1-dev-plus-aosp am: 146f745175" into nyc-mr2-dev-plus-aosp am: 4e03af8651
am: 1802612324

Change-Id: Idd513cf6b95bd5ccab502fe5f5330b825cf09854

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 20:14:12 +0000 (20:14 +0000)]

Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84" into nyc-mr1-dev-plus-aosp am: 146f745175 am: 530e6896b9
am: 9c916450da

Change-Id: I7fabffca27cce11e466173096f08c7a2921c3990

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 20:13:48 +0000 (20:13 +0000)]

Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84 am: 4c08ce83d1" into nyc-mr2-dev-plus-aosp am: 301456c250
am: 1e1b35c19d

Change-Id: I33b296b272d63bb5fd2693ba65f3b9f3e7811611

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 20:13:31 +0000 (20:13 +0000)]

Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84 am: 4c08ce83d1 am: 01ccf676e3
am: 1cc4fc41ae

Change-Id: I6b6e143f8581a7bf23daa5b0516b0428f49f943d

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:13:16 +0000 (20:13 +0000)]

Merge "Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7" into nyc-mr1-dev-plus-aosp am: 977fa4ba31" into nyc-mr2-dev-plus-aosp am: ae5446cbdc
am: 315e51f00f

Change-Id: I6ef6f3ec353223115308e3a8d55a6ca6b5079164

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:13:00 +0000 (20:13 +0000)]

Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7" into nyc-mr1-dev-plus-aosp am: 977fa4ba31 am: 1fb18eaaf9
am: e29a1603ff

Change-Id: Ie6be7d6721cd5d04e0e89b8364e554e63f268031

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:12:43 +0000 (20:12 +0000)]

Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: bc02b9f045" into nyc-mr2-dev-plus-aosp am: d065cd796c
am: 19229c4e69

Change-Id: I3b876bc68bc37ec044f912d85bf47f360146b630

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:12:23 +0000 (20:12 +0000)]

Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: bc02b9f045 am: 54491f9f70
am: 29e0383930

Change-Id: I912cee9e4cbf3b9c0b9a40e8e88224a64d9a3c8d

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:12:07 +0000 (20:12 +0000)]

Merge "Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf -s ours am: 1d2a009979 -s ours am: 2c6307af33 -s ours" into nyc-mr1-dev-plus-aosp am: cf38dd18f9 -s ours" into nyc-mr2-dev-plus-aosp am: 8ddf92f83f -s ours
am: 965c7d51e7 -s ours

Change-Id: Ib1b6362db1d314733942b5eb002414bd78b52a23

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:11:39 +0000 (20:11 +0000)]

Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf -s ours am: 1d2a009979 -s ours am: 2c6307af33 -s ours" into nyc-mr1-dev-plus-aosp am: cf38dd18f9 -s ours am: 731f55380c -s ours
am: cfaa19e31c -s ours

Change-Id: Ie1f567d1163b2608d0c78ccc65be46b6f55fad1f

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:11:11 +0000 (20:11 +0000)]

Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf -s ours am: 1d2a009979 -s ours am: 2c6307af33 -s ours am: 57ac8058b6 -s ours" into nyc-mr2-dev-plus-aosp am: 85830e3e45 -s ours
am: b63867c2a7 -s ours

Change-Id: I6501fbc0c7bb67914bb95033a7395b22762ada39

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:10:40 +0000 (20:10 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf -s ours am: 1d2a009979 -s ours am: 2c6307af33 -s ours am: 57ac8058b6 -s ours am: 91f0b198ee -s ours
am: 7bc2a136f9 -s ours

Change-Id: Idf2c88674a7adbe4e96f7ae01b17bbc5b2980be2

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:09:50 +0000 (20:09 +0000)]

Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 -s ours am: 55fe6e8997 -s ours am: 7bab558fb8 -s ours" into nyc-mr1-dev-plus-aosp am: a185466ba9 -s ours" into nyc-mr2-dev-plus-aosp am: 9f321a7874 -s ours
am: 7023b4e3dd -s ours

Change-Id: I2c4064b7df787b76555a5709a3190a53d9518c26

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:09:12 +0000 (20:09 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 -s ours am: 55fe6e8997 -s ours am: 7bab558fb8 -s ours" into nyc-mr1-dev-plus-aosp am: a185466ba9 -s ours am: 3b908a5583 -s ours
am: 6b37ec2382 -s ours

Change-Id: I5e698854a23f2a0a7e93c357affe0f40f7bf9366

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:08:42 +0000 (20:08 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 -s ours am: 55fe6e8997 -s ours am: 7bab558fb8 -s ours am: 578e9af267 -s ours" into nyc-mr2-dev-plus-aosp am: 00e79d6cb0 -s ours
am: 50a7d61bbe -s ours

Change-Id: I34ffc412dbe315f28cb6e749de45a2d9b0257f3f

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:08:14 +0000 (20:08 +0000)]

Remove tests affected by NV/OES_viewport_array extension am: 267c765690 -s ours am: 55fe6e8997 -s ours am: 7bab558fb8 -s ours am: 578e9af267 -s ours am: a98fc6842f -s ours
am: 823c4b28f5 -s ours

Change-Id: Idb3634ca4d497d77b243b2622993b18446b855f0

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:07:53 +0000 (20:07 +0000)]

Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53 am: c0d6b5c22b -s ours" into nyc-mr2-dev-plus-aosp am: 1a7a472c46 -s ours
am: 742f1b4a4d -s ours

Change-Id: Ibd8f506fdc2fceebec11a44466719a10a8e0b785

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:07:36 +0000 (20:07 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53 am: c0d6b5c22b -s ours am: ab3c5142fa -s ours
am: 68064c940c -s ours

Change-Id: I704816838b9336c1a14599a4dd5d541cd91169ce

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:07:19 +0000 (20:07 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34 am: 3665d90d07 -s ours" into nyc-mr2-dev-plus-aosp am: 0814dedc8b -s ours
am: e553090f6a -s ours

Change-Id: Ie51159d7cdb90ffe8f3ef41be3b6e5295f041f6a

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:07:00 +0000 (20:07 +0000)]

Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34 am: 3665d90d07 -s ours am: 606e0ad44f -s ours
am: 147a43941b -s ours

Change-Id: Ic5ef0dc2ca678dcec85cd121e19740970c9d2613

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:06:24 +0000 (20:06 +0000)]

Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220 am: 987939f284" into nyc-mr2-dev-plus-aosp am: c4617ac622
am: 5d201524b3

Change-Id: Ib4e43da1c9acc82d58f5ba0ad89c2cb241046a05

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:05:54 +0000 (20:05 +0000)]

Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 5611bf398b am: e2d1c25650 am: d368eb8664 am: 8cfa8cb220 am: 987939f284 am: 92f412bb50
am: 2f6cf734f8

Change-Id: Ie6888f76dfc8b936b79d28d7d50acf7ba4015b28

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 20:05:17 +0000 (20:05 +0000)]

Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc am: afc69d0dd1 am: f7bcd5d876" into nyc-mr2-dev-plus-aosp am: d6eee093f9
am: ed947b61ab

Change-Id: I55afec651c6b6a70c15c3993e6cdf9517d110839

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 20:04:05 +0000 (20:04 +0000)]

Generate flat triangles in polygon offset tests. am: 975a59ebca am: 0bde00f9d6 am: b57eb2d24f am: aa9a995cfc am: afc69d0dd1 am: f7bcd5d876 am: 4fdce7d4d1
am: 1ead02dfc6

Change-Id: I6ef16bc7b94ebb962fe8744da97cf36e94e7d36a

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:03:25 +0000 (20:03 +0000)]

Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: f3d81a3cd9 am: 3b0479c233 am: 0a2fdff220 am: d8355f769b am: a4ca32e8d3" into nyc-mr2-dev-plus-aosp am: bb99be6bcd
am: 178fdad625

Change-Id: Id93307c696c142e2be99248dadc5ac6f93526733

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:02:50 +0000 (20:02 +0000)]

Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: f3d81a3cd9 am: 3b0479c233 am: 0a2fdff220 am: d8355f769b am: a4ca32e8d3 am: 10374df5c4
am: 8a09cd85d6

Change-Id: Icb30357f1001ecedbc972820076cc450014b0ad7

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:02:32 +0000 (20:02 +0000)]

Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9 am: c29aba4a88 am: e29f3de157" into nyc-mr2-dev-plus-aosp am: 140a9f7e32
am: 76d12d66d0

Change-Id: I6920670e0cdbbc732ae34d79cbb712e579e616e5

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 20:02:10 +0000 (20:02 +0000)]

Relax line width verification in primitive bbox tests am: ba45591407 am: b4fbc02e3c am: b9b63c17d2 am: 4f191e12a9 am: c29aba4a88 am: e29f3de157 am: befdc5649a
am: a4f27e56a9

Change-Id: I6f7c04425b5556f1fef027a425bfa6d18e32619a

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:01:53 +0000 (20:01 +0000)]

Merge "Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2 am: 930d6894e5 am: 1a09b5270f" into nyc-mr2-dev-plus-aosp am: 1a22842512
am: ba94cb3ad6

Change-Id: I6dfa2ebe25c7fdf18dbbdff645b8333de7ecff02

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:01:37 +0000 (20:01 +0000)]

Merge "Fix eglBindAPI negative test" into nougat-cts-dev am: 6068dfbf3a am: 365f81e68c am: 15cde0b466 am: b21dbe99b2 am: 930d6894e5 am: 1a09b5270f am: 5999552dcf
am: 5d26ea8bed

Change-Id: I8655ebf9f352cec3cb25bf1d3c34cc1104ccf1b6

commit | commitdiff | tree

Nicolas Boichat [Tue, 22 Aug 2017 20:01:21 +0000 (20:01 +0000)]

Merge "Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed am: fc116aa764 am: 5b5f75828b" into nyc-mr2-dev-plus-aosp am: f40c8d91c6
am: 699fa6ce88

Change-Id: Iea7748eb5d30a9d3c85ca76ea9fd4d49cbd451eb

commit | commitdiff | tree

Nicolas Boichat [Tue, 22 Aug 2017 20:01:03 +0000 (20:01 +0000)]

Fix eglBindAPI negative test am: 09784f8510 am: 3342150f5a am: 1af587d644 am: 52211c87ed am: fc116aa764 am: 5b5f75828b am: a8199aac7c
am: 7f0cc5baf8

Change-Id: I757c31d1964f1d49b6d0b50fc05cd4304a4062b1

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 20:00:30 +0000 (20:00 +0000)]

Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5 am: 6fd723a7cc" into nyc-mr2-dev-plus-aosp am: 072c251d10
am: 64cc77a2d7 -s ours

Change-Id: I743e8ae6251093948156cce830ed4e9617b1cd82

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:59:51 +0000 (19:59 +0000)]

Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5 am: 6fd723a7cc am: bd1a96bd10
am: 058c463e80 -s ours

Change-Id: I69952db9d0670c292db610f65102e086604191b1

commit | commitdiff | tree

Kenneth Graunke [Tue, 22 Aug 2017 19:59:12 +0000 (19:59 +0000)]

Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27 am: 0e230d6099" into nyc-mr2-dev-plus-aosp am: 1c4dcaec85
am: 22d532ae44 -s ours

Change-Id: I7735a4d1aa1bf8dbe88b5da4dea3c6a12b98c476

commit | commitdiff | tree

Kenneth Graunke [Tue, 22 Aug 2017 19:58:41 +0000 (19:58 +0000)]

Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27 am: 0e230d6099 am: 2032b1fbed
am: 42ad161115 -s ours

Change-Id: Iaf66b53b32d9496d751dc0fb2998c873351b9506

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:58:07 +0000 (19:58 +0000)]

Merge "Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951 am: b7985f162a am: 4ab2fada98" into nyc-mr2-dev-plus-aosp am: 8f231318dc
am: 305025ae84

Change-Id: I8683b8a1741f927508c56f43e64c3cf6213a74be

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:57:30 +0000 (19:57 +0000)]

Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 6d4c0dca61 am: d64bb66820 am: ec68ba0951 am: b7985f162a am: 4ab2fada98 am: d9e96ae59b
am: a6963b76bf

Change-Id: I876e342195bd2cb4eefb825e0013616d8daa9eb9

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:57:00 +0000 (19:57 +0000)]

Merge "Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8 am: acce97d998 am: 23baea4982" into nyc-mr2-dev-plus-aosp am: 1fbdd02485
am: 8e5ee8a4f8

Change-Id: I36f3e382d22854f153a7647fb74240f35038a700

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:56:40 +0000 (19:56 +0000)]

Optimize swapchain OOM tests am: 1614827a71 am: 2cfe132119 am: 00ab17bd23 am: c9b7dae8a8 am: acce97d998 am: 23baea4982 am: f6a0d45a54
am: 0410c59722

Change-Id: I4626e66653087a1677a0b49b6c5f08c4774f6cf2

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:56:20 +0000 (19:56 +0000)]

Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: e19d6a6859 am: e0e2260a4a am: 222ef92210 am: c6747b082f am: cfc3d67576" into nyc-mr2-dev-plus-aosp am: db7525e0dc
am: a89936ca4d

Change-Id: I1a14a141464b8101a49be56dc74e5f124a3a7a11

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:50:50 +0000 (19:50 +0000)]

Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: e19d6a6859 am: e0e2260a4a am: 222ef92210 am: c6747b082f am: cfc3d67576 am: c5e76fa2a2
am: 5fe83954f2

Change-Id: Ib78a1ed3fddf19e8ed1d3f64ebc6689395e33016

commit | commitdiff | tree

Kenneth Graunke [Tue, 22 Aug 2017 19:50:34 +0000 (19:50 +0000)]

Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: 6a6f549150 am: f9b870fb5b am: b47baae90a am: 76a7f607a5 am: 602c392f12" into nyc-mr2-dev-plus-aosp am: 6192e24e15
am: 23db5638d1

Change-Id: I21a80f967d47ef12ec164c87f2a25635724483e9

commit | commitdiff | tree

Kenneth Graunke [Tue, 22 Aug 2017 19:50:21 +0000 (19:50 +0000)]

Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: 6a6f549150 am: f9b870fb5b am: b47baae90a am: 76a7f607a5 am: 602c392f12 am: 03e08ec810
am: 22c3f9624a

Change-Id: Ib0219e5326f6e88828329eb0268107253ddbf776

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:50:04 +0000 (19:50 +0000)]

Merge "Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc am: 5f30178321 am: 764cd6e60b am: 0a683a56e7 am: e961416ca6 am: ee59a7cc22 -s ours" into nyc-mr2-dev-plus-aosp am: 44bab0a654 -s ours
am: 89918ce31e -s ours

Change-Id: Ice68b82590b0fa1d5978f9884a2f163e12ec7b64

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:49:41 +0000 (19:49 +0000)]

Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc am: 5f30178321 am: 764cd6e60b am: 0a683a56e7 am: e961416ca6 am: ee59a7cc22 -s ours am: 3d8ac1f5a5 -s ours
am: 67ffa16c50 -s ours

Change-Id: I7636a67cd403b0cf1d63b63599b290eb68da8c2e

commit | commitdiff | tree

Mark Adams [Tue, 22 Aug 2017 19:49:12 +0000 (19:49 +0000)]

Merge "Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95c7 am: 0624edb1ce am: 234daba7b4 am: 8d164d1990 -s ours" into nyc-mr2-dev-plus-aosp am: d9abcf26e5 -s ours
am: 04a95d4c7c -s ours

Change-Id: I787c52c2696950906eec00ff2c8ff9f5e73c17f0

commit | commitdiff | tree

Mark Adams [Tue, 22 Aug 2017 19:48:44 +0000 (19:48 +0000)]

Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 4b7baeace7 am: 86683f95c7 am: 0624edb1ce am: 234daba7b4 am: 8d164d1990 -s ours am: bf21c39e9a -s ours
am: 0bcfb6255c -s ours

Change-Id: I6f40cc3ba8929784565b1e0f29c4edaadef91f60

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:48:03 +0000 (19:48 +0000)]

Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb am: 011ccfc134 -s ours" into nyc-mr2-dev-plus-aosp am: f5600f9aaf -s ours
am: 421ec17515 -s ours

Change-Id: I6430248b72b92f18c60e80a5007bc16cfe0fe8d6

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:47:10 +0000 (19:47 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb am: 011ccfc134 -s ours am: 5653120f84 -s ours
am: f215c5ffab -s ours

Change-Id: Iae5a5d85e038713c00f6a3267551b9abac2c7f93

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:46:20 +0000 (19:46 +0000)]

Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df am: 2ecead38c4 -s ours" into nyc-mr2-dev-plus-aosp am: 76768aa15e -s ours
am: 5278ffdd2a -s ours

Change-Id: I960ebd58ca15845cc3c6949bcce3111a0a6128f3

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:46:02 +0000 (19:46 +0000)]

Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df am: 2ecead38c4 -s ours am: b1fe967ef0 -s ours
am: ac7365be3d -s ours

Change-Id: I3804968996f25171f6a54aef7a4ac38db3ad14d5

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:45:46 +0000 (19:45 +0000)]

Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f am: e89621e593" into nyc-mr2-dev-plus-aosp am: bb2bb196e2
am: d5f9a459b9

Change-Id: I6fd65d04d6513c35196fe3081b3e5be19f3566cd

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:45:28 +0000 (19:45 +0000)]

Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: 73b7f271a9 am: 0b9596cb35 am: 436488b78f am: e89621e593 am: f8c8d5ff8d
am: 96ac2db74f

Change-Id: I71c3ad547ecb67bea2722ddabe305993c6073b52

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:45:04 +0000 (19:45 +0000)]

Merge "Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a" into nyc-mr1-dev-plus-aosp am: c60e446249" into nyc-mr2-dev-plus-aosp am: 058d1a53d2
am: ee4c986c2d

Change-Id: I6b4bbfc8d73e0bdcaf892641f101286036b528c3

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:44:44 +0000 (19:44 +0000)]

Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a" into nyc-mr1-dev-plus-aosp am: c60e446249 am: ff1ea61283
am: 377b97eb12

Change-Id: Ia2bc1d515484a57729b1a1088bd4503fca9befd0

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:44:21 +0000 (19:44 +0000)]

Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: ddf3f33d7a" into nyc-mr2-dev-plus-aosp am: 0265d22b8c
am: c06d7cb976

Change-Id: Ibb39aa0aa367c3891ae05d09842498b4bfab3b37

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:43:45 +0000 (19:43 +0000)]

Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: ddf3f33d7a am: 957322a3c7
am: 625a1dc440

Change-Id: Ie00b57eb9e99f1cce05f01065161ae43b7728262

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 19:43:15 +0000 (19:43 +0000)]

Merge "Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84 am: b89872b38a" into nyc-mr2-dev-plus-aosp am: d9b4127ee3
am: ce7aae0c17

Change-Id: Ib5b085cea0ed2d2624f2d0b572d85173cdd2e533

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 19:42:42 +0000 (19:42 +0000)]

Generate flat triangles in polygon offset tests. am: 975a59ebca am: 02c67b12c1 am: 0e7da13770 am: 0dbb18ee84 am: b89872b38a am: 709049d1f3
am: 4b12f97d1b

Change-Id: I74a9416d4c406a7f941f8e2c08c32478ee5acfa4

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:42:14 +0000 (19:42 +0000)]

Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: 09377becd7" into nyc-mr2-dev-plus-aosp am: 3db7131bdf
am: 37b681c300

Change-Id: I05dc65cb0a4a85f34f8adf5f17ccb9abf7eab69e

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:41:34 +0000 (19:41 +0000)]

Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 36d3dd2ab1 am: 5debc545bf am: ee10cd68f7 am: 09377becd7 am: 40c5c485ff
am: e40b89e7b4

Change-Id: Ie753a31e252540a94ed6ff00603f10fefbcedac7

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:41:01 +0000 (19:41 +0000)]

Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: ea7ea6aeee am: 562348c4a0 am: b03f7416cd" into nyc-mr2-dev-plus-aosp am: dfdb3bb243
am: 53b0618ee8

Change-Id: I60a2bdc94bc50b3f701295de1b03a4d47df52f28

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:40:47 +0000 (19:40 +0000)]

Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am: 61d6d95a66 am: ea7ea6aeee am: 562348c4a0 am: b03f7416cd am: 94adec74ae
am: af6ce9c1aa

Change-Id: I22256192778f7b914caaec5e49afe4509277b363

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:40:33 +0000 (19:40 +0000)]

Merge "Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: 6734db1692" into nyc-mr2-dev-plus-aosp am: c9967871b3
am: 8c878710f0

Change-Id: I6b43bd47a75702e5f4746d1d4bb4b107a74044df

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:40:20 +0000 (19:40 +0000)]

Relax line width verification in primitive bbox tests am: ba45591407 am: a11fd8b487 am: 90c49fe030 am: 04d8a8e98a am: 6734db1692 am: 74bbc068d7
am: c9c670873f

Change-Id: I7e6a03d93065f8ba93155f77866a18b510fade3f

commit | commitdiff | tree

Alexander Galazin [Tue, 22 Aug 2017 19:40:02 +0000 (19:40 +0000)]

Generate flat triangles in polygon offset tests. am: 975a59ebca am: b1c225b9d6 am: f8e27c683d am: 5ccc8a2ee8 am: 678de5eb37
am: 172992bc49

Change-Id: I945a448e1e435248be1728bb0d703f889e254440

commit | commitdiff | tree

Tina Zhou [Tue, 22 Aug 2017 19:39:49 +0000 (19:39 +0000)]

Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am: 312a550657 am: 487543e953 am: ed835f32e2 am: cd215677dd am: 1d8a06d405
am: 2350c4f9f3

Change-Id: Id1434c582540bb03e463c774d4373c783dffefe0

commit | commitdiff | tree

Pyry Haulos [Tue, 22 Aug 2017 19:39:29 +0000 (19:39 +0000)]

resolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff am: e37a75a4b9 am: 2d1edbcbc6
am: a1d7048d03

Change-Id: I1ba478d3d4dc3c3a881260781bf143b0b7ef2e0f