Pyry Haulos [Fri, 17 Mar 2017 12:37:35 +0000 (12:37 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
19bf995047 am:
80b99cc54a
am:
b39a206388
Change-Id: I9090b68b50e4ea78de045ee0a303815970d0fb32
Pyry Haulos [Fri, 17 Mar 2017 12:30:01 +0000 (12:30 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
19bf995047
am:
80b99cc54a
Change-Id: If15160bc9cb51778d6805b0ea33336dc8c660b99
Pyry Haulos [Fri, 17 Mar 2017 12:22:38 +0000 (12:22 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d
am:
19bf995047
Change-Id: I092e8e8e119e4e004bb1451cb1fb999bf2e9a42d
Pyry Haulos [Fri, 17 Mar 2017 12:21:04 +0000 (12:21 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
5f34117776 am:
eba2559865 am:
99f3ab7c5a
am:
91a3078a37
Change-Id: Ifcb62bf0bad43f5bde5e1a693f886292a7ac2d42
Pyry Haulos [Fri, 17 Mar 2017 12:18:04 +0000 (12:18 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
5f34117776 am:
eba2559865
am:
99f3ab7c5a
Change-Id: I94915828f9db6edce08b0ca860de8f7eeb6ffdd8
Pyry Haulos [Fri, 17 Mar 2017 12:14:33 +0000 (12:14 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d am:
5f34117776
am:
eba2559865
Change-Id: Ic1f2a2853173047311052607311518ea9b3b5264
Pyry Haulos [Fri, 17 Mar 2017 12:11:19 +0000 (12:11 +0000)]
Fix warning introduced in
2c9e3ec9 am:
521361d83d
am:
5f34117776
Change-Id: I79c64f4d5c3d494e7c5f11df44a00478648e581a
Pyry Haulos [Fri, 17 Mar 2017 12:09:41 +0000 (12:09 +0000)]
Fix warning introduced in
2c9e3ec9
am:
521361d83d
Change-Id: I82a9917cb875a166583a41e3d1bb7702ae2d3db8
Pyry Haulos [Fri, 17 Mar 2017 12:08:03 +0000 (12:08 +0000)]
Fix warning introduced in
2c9e3ec9
am:
521361d83d
Change-Id: Iaf6e63f119e32613ec46fa9135c7c3be42fd47b3
Pyry Haulos [Wed, 15 Mar 2017 19:23:06 +0000 (12:23 -0700)]
Fix warning introduced in
2c9e3ec9
Change-Id: I42bef21b2cc7274f107e5455dea1e382d8a419f4
(cherry picked from commit
d8b452a7533c195b1328918bb696a819542ff044)
Alexander Galazin [Wed, 15 Mar 2017 18:49:46 +0000 (18:49 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
dce98dc6e9 am:
650fc6607d am:
2e13d553b0
am:
cb66bf73ac
Change-Id: If1df99d0a18e64d936c86cfcc3e47b3f5397bd35
Alexander Galazin [Wed, 15 Mar 2017 18:49:37 +0000 (18:49 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
468843cf08 am:
726720187d
am:
19a2ee6b36
Change-Id: Iaa9cc296b78b803d5e7f27c6ff224fe6a7c9aed7
Alexander Galazin [Wed, 15 Mar 2017 18:45:16 +0000 (18:45 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
dce98dc6e9 am:
650fc6607d
am:
2e13d553b0
Change-Id: Ie86c0eb85ff9c8761a45556df5cb05f0cb8ba143
Alexander Galazin [Wed, 15 Mar 2017 18:45:08 +0000 (18:45 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
468843cf08
am:
726720187d
Change-Id: Ibf84d3952485eedee9732f9ef7edc4b0cce08a5c
Alexander Galazin [Wed, 15 Mar 2017 18:44:38 +0000 (18:44 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740 am:
dce98dc6e9
am:
650fc6607d
Change-Id: I15dea4f22dff8a97150ade21c3496273e99ab3ba
Alexander Galazin [Wed, 15 Mar 2017 18:40:08 +0000 (18:40 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740
am:
468843cf08
Change-Id: I9dbbc27bd20cfa6a2142ac132da5068b471046a3
Alexander Galazin [Wed, 15 Mar 2017 18:40:07 +0000 (18:40 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev am:
0532365740
am:
dce98dc6e9
Change-Id: I8e13f121b5f9f075ec01196d81ac541c8e1b55f7
Alexander Galazin [Wed, 15 Mar 2017 18:35:38 +0000 (18:35 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev
am:
0532365740
Change-Id: I33b9d9b1fbe0b11ce2af87708bd9682ed728a706
Alexander Galazin [Wed, 15 Mar 2017 18:35:35 +0000 (18:35 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev
am:
0532365740
Change-Id: I12be73b76f9ae43955fbca0071f36b897e82f0d9
Treehugger Robot [Wed, 15 Mar 2017 18:30:21 +0000 (18:30 +0000)]
Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev
Alexander Galazin [Wed, 15 Mar 2017 15:46:57 +0000 (15:46 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
875d3c2990 am:
4a2a606f28 am:
31335b5fc3
am:
4a75760b34
Change-Id: I9b14c044d4e4ddc6d93efc2aefed48d5750b39ee
Alexander Galazin [Wed, 15 Mar 2017 15:41:56 +0000 (15:41 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
875d3c2990 am:
4a2a606f28
am:
31335b5fc3
Change-Id: I4d4f9bc741b731e6f1379113c04dd7b1404974f8
Alexander Galazin [Wed, 15 Mar 2017 15:37:25 +0000 (15:37 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
875d3c2990
am:
4a2a606f28
Change-Id: I295fdd5c2bfeb2d85b09d1717b19d7b92d270389
Alexander Galazin [Wed, 15 Mar 2017 15:37:25 +0000 (15:37 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
d01980d03d am:
1efb4d5fdd
am:
a03d5cd549
Change-Id: Iceb00fc5b49b344c534120678f051449c19a7ed4
Alexander Galazin [Wed, 15 Mar 2017 15:32:25 +0000 (15:32 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9 am:
d01980d03d
am:
1efb4d5fdd
Change-Id: Ie667a58dcc0b40dc0e0d7553e52f0d3e5121859e
Alexander Galazin [Wed, 15 Mar 2017 15:32:24 +0000 (15:32 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9
am:
875d3c2990
Change-Id: I00af902dcb247905e4f8b3610697177acd98879b
Alexander Galazin [Wed, 15 Mar 2017 15:27:24 +0000 (15:27 +0000)]
Use glReadnPixels only if KHR_robustness is supported
am:
d99ba132d9
Change-Id: I61323fdb484c606044509dc6d8ea6724dd8989a8
Alexander Galazin [Wed, 15 Mar 2017 15:27:24 +0000 (15:27 +0000)]
Use glReadnPixels only if KHR_robustness is supported am:
d99ba132d9
am:
d01980d03d
Change-Id: I08946ff5a8682be58afe58db7ba462229e1ad8c7
Alexander Galazin [Wed, 15 Mar 2017 15:22:52 +0000 (15:22 +0000)]
Use glReadnPixels only if KHR_robustness is supported
am:
d99ba132d9
Change-Id: Icd032ba51a9c2c6141b21083b300e8709ecd7b45
Alexander Galazin [Mon, 6 Mar 2017 18:44:38 +0000 (19:44 +0100)]
Further relax line verification in primitive bbox tests
The original relaxation patch
ba45591407d0207e8ba0634ea5636fd721ed781f
allowed lines to be 1 pixel thinner or thicker compared
to the expected width. Unfortunately it missed the case
of a line with the width of 1 pixel that has extra verification
in the framework. This change covers this gap.
Google bug:
35987764
Change-Id: I193d76ae13738702c9d7361d1957f15ea7600c4f
Alexander Galazin [Thu, 23 Feb 2017 12:01:18 +0000 (13:01 +0100)]
Use glReadnPixels only if KHR_robustness is supported
glReadnPixels is introduced in KHR_robustness/GLES 3.2.
Use of this function in GLES 3.1 tests will result in segfault
on implementations that don't support KHR_robustness.
Components: AOSP, Framework
Affects: dEQP-GLES31.functional.debug.negative_coverage.callbacks.buffer.read_pixels_format_mismatch
VK-GL-CTS issue: 166
Google bug:
36122027
Change-Id: Idbe8734f7d82882ea99c75a8b74d693ac6dd831f
(cherry picked from commit
219019495770c221e92f43df3e76a954c613210d)
Mika Isojrvi [Thu, 9 Feb 2017 23:18:55 +0000 (23:18 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
ebc8257bba am:
31a4d9b3b6 am:
19045bffb6
am:
53fbafc635
Change-Id: I73923046f4ce79cbb1f806ff5aa07a30b1311068
Mika Isojrvi [Thu, 9 Feb 2017 23:18:42 +0000 (23:18 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
eef2e716e7 am:
bdff405d5a
am:
92584aee17
Change-Id: Id393184c9118d63c29bde2ca15229c50235f171e
Mika Isojrvi [Thu, 9 Feb 2017 23:12:19 +0000 (23:12 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
ebc8257bba am:
31a4d9b3b6
am:
19045bffb6
Change-Id: Ic6c8704365207012e20a8aa6e06535f3043581e1
Mika Isojrvi [Thu, 9 Feb 2017 23:12:06 +0000 (23:12 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
eef2e716e7
am:
bdff405d5a
Change-Id: Ic937fa24f51ca1ab5325f14e6ac11de51bbe60e5
Mika Isojrvi [Thu, 9 Feb 2017 22:57:53 +0000 (22:57 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634 am:
ebc8257bba
am:
31a4d9b3b6
Change-Id: Ic7752c780d15bb505ae7b1da440ef5ebd57935dd
Mika Isojrvi [Thu, 9 Feb 2017 22:52:38 +0000 (22:52 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634
am:
eef2e716e7
Change-Id: I620a89283d84b4499fd475328b421a88b6a7fd9b
Mika Isojrvi [Thu, 9 Feb 2017 22:50:00 +0000 (22:50 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests am:
6bc3c7a634
am:
ebc8257bba
Change-Id: I2a126ebe68698ba492a417060892345233d930de
Mika Isojrvi [Thu, 9 Feb 2017 22:48:01 +0000 (22:48 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests
am:
6bc3c7a634
Change-Id: Iecf872eac117cf28385d2b3c7e94a9801fd83b5e
Mika Isojrvi [Thu, 9 Feb 2017 22:41:59 +0000 (22:41 +0000)]
Limit changes by xor to upper 8 bits in mixed atomic tests
am:
6bc3c7a634
Change-Id: I354ee074ad57d53c2b4b0a84d8bc02a02912f19d
Mika Isojärvi [Wed, 16 Nov 2016 23:10:29 +0000 (15:10 -0800)]
Limit changes by xor to upper 8 bits in mixed atomic tests
Bug:
31270281
Test: Ran tests on multiple devices
Change-Id: I64393591171b304cd071f7a37b91efd2c7a853a6
Tina Zhou [Mon, 23 Jan 2017 19:47:41 +0000 (19:47 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca
am:
bb7e6b4f15
Change-Id: I7bcbd90f63e2e377023ca01c84d8288fbfa72899
Chad Versace [Mon, 23 Jan 2017 19:47:28 +0000 (19:47 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9
am:
587123a671
Change-Id: Ice737a2f0af8cd00df9e4ffb41508a2e6fff7308
Tina Zhou [Mon, 23 Jan 2017 19:47:14 +0000 (19:47 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0
am:
d737e16da8
Change-Id: I78275ecfcd4083a2202b9c93da27d1c67d73d4c6
Chad Versace [Mon, 23 Jan 2017 19:46:59 +0000 (19:46 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd
am:
97cc16aa0a
Change-Id: Id2519746b786bdb934ae7dc9da3d9aab11ae1620
Tina Zhou [Mon, 23 Jan 2017 19:46:44 +0000 (19:46 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a
am:
40ff9476c8
Change-Id: I9d7b630eb034e76830e9ccfa47d881278b3def09
Chad Versace [Mon, 23 Jan 2017 19:46:24 +0000 (19:46 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48
am:
c6bf22467b
Change-Id: I178d4051826827c2f785f9d6ca8507fab1d4a931
Tina Zhou [Mon, 23 Jan 2017 19:46:10 +0000 (19:46 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509
am:
ce18fbd526
Change-Id: I024c4287173d6b46f9752c42387ba23a6768d8e9
Chad Versace [Mon, 23 Jan 2017 19:45:55 +0000 (19:45 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4
am:
c1c16c73e6
Change-Id: Icfb6d4528e2b5c27ccb47095b8a3abc85c180c3c
Tina Zhou [Mon, 23 Jan 2017 19:38:47 +0000 (19:38 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f
am:
d46ac1a0ca
Change-Id: I9e8b270b31328b2ae2619c144685cdf1239f1765
Chad Versace [Mon, 23 Jan 2017 19:38:37 +0000 (19:38 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e
am:
e7ee6541a9
Change-Id: I7f8e0c8c52bf28353af47abea83f09e20500b7dd
Tina Zhou [Mon, 23 Jan 2017 19:38:26 +0000 (19:38 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e
am:
1b341143c0
Change-Id: Ib5ce54db7e4a82a80c10538931f2fd01b6bd6502
Chad Versace [Mon, 23 Jan 2017 19:38:10 +0000 (19:38 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223
am:
319a51d5dd
Change-Id: I4ea299b0da691d4b057690ed63662e13e246b9ce
Tina Zhou [Mon, 23 Jan 2017 19:37:59 +0000 (19:37 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0
am:
f23a03362a
Change-Id: I386402636396dd6d956197dc1d2e1127bb145019
Chad Versace [Mon, 23 Jan 2017 19:37:48 +0000 (19:37 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8
am:
8c04df2e48
Change-Id: Iec487e77848eb572b190561d836bf2a903f84820
Tina Zhou [Mon, 23 Jan 2017 19:37:22 +0000 (19:37 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949
am:
7b1b2f4509
Change-Id: I69d17f550317280f58c89feb0092cbcfe70730e0
Chad Versace [Mon, 23 Jan 2017 19:37:08 +0000 (19:37 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e
am:
1eb4f43dc4
Change-Id: Ifa42ea781f68bf222c085febb068690003c52f6b
Tina Zhou [Mon, 23 Jan 2017 19:29:07 +0000 (19:29 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda
am:
b92f7d676f
Change-Id: I4ca013bb45ac988c620fbed0cc41b0ae97245368
Chad Versace [Mon, 23 Jan 2017 19:28:54 +0000 (19:28 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5
am:
0ed6cc912e
Change-Id: I19a253ad05018b272ba5544381e9b5e0e0a0fd02
Tina Zhou [Mon, 23 Jan 2017 19:28:40 +0000 (19:28 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0
am:
7bb5047d5e
Change-Id: I79e6b68a368287de56d95375ca573e066feca3d3
Chad Versace [Mon, 23 Jan 2017 19:28:26 +0000 (19:28 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff
am:
ca5a475223
Change-Id: I2fbd930f7d37b8d100d6ae1839f4f783bc09643f
Tina Zhou [Mon, 23 Jan 2017 19:25:05 +0000 (19:25 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222
am:
6aef236dd0
Change-Id: Ide0e9861cc1e38bf32030cdc89f2128d3d72b7d5
Chad Versace [Mon, 23 Jan 2017 19:24:52 +0000 (19:24 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0
am:
0fe4efcfa8
Change-Id: Ibea958c446ac219b635df4bf33e799603c02edba
Tina Zhou [Mon, 23 Jan 2017 19:24:38 +0000 (19:24 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea
am:
b6766f9949
Change-Id: I3191b4256a031d3b100cff9eff1ee29923c032ef
Chad Versace [Mon, 23 Jan 2017 19:24:25 +0000 (19:24 +0000)]
x11: Fix deadlock am:
5e863331b2
am:
f49e8bfc0e
Change-Id: I369a74b5b264d481506b413fcacc1f845c3ab68f
Tina Zhou [Mon, 23 Jan 2017 19:22:33 +0000 (19:22 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222
am:
a74d50ffda
Change-Id: Ib9a092812b9027562245d4ce9d94da0855be31ff
Chad Versace [Mon, 23 Jan 2017 19:22:22 +0000 (19:22 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0
am:
f465d82fa5
Change-Id: I96a8a4bd5fe510d2a1109512b9347e8e57a54b6b
Tina Zhou [Mon, 23 Jan 2017 19:22:11 +0000 (19:22 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea
am:
05f26155f0
Change-Id: If1425de76d53473673400dd95c6c37a885dc37e3
Chad Versace [Mon, 23 Jan 2017 19:21:59 +0000 (19:21 +0000)]
x11: Fix deadlock am:
5e863331b2
am:
7d0ad652ff
Change-Id: Iee8b38b57db70a18a98eda81ce47031aacd42106
Tina Zhou [Mon, 23 Jan 2017 19:15:41 +0000 (19:15 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
am:
cbdbf95222
Change-Id: Ibe138431c7fca21c9fed9a63a3c70a29ee9388b2
Chad Versace [Mon, 23 Jan 2017 19:15:39 +0000 (19:15 +0000)]
x11: Call XInitThreads()
am:
5d11c9d2c0
Change-Id: Ie64aa435c9f47de24df207f46a6831c2adf1e36a
Tina Zhou [Mon, 23 Jan 2017 19:15:18 +0000 (19:15 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
am:
34b869eeea
Change-Id: I7c6fe801d1afd23804e4b30a4cd496feb795bc79
Chad Versace [Mon, 23 Jan 2017 19:15:17 +0000 (19:15 +0000)]
x11: Fix deadlock
am:
5e863331b2
Change-Id: I2a59eb8b76b5106f6696d05a9e9181489399ddc3
Tina Zhou [Mon, 23 Jan 2017 19:12:27 +0000 (19:12 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
am:
cbdbf95222
Change-Id: I2531e5a260f50c8bae1a756a61026a46ae253614
Chad Versace [Mon, 23 Jan 2017 19:12:25 +0000 (19:12 +0000)]
x11: Call XInitThreads()
am:
5d11c9d2c0
Change-Id: Ib89f9fbfaa7d0b3dcb590fc2ac20ff2c83e3fbad
Tina Zhou [Mon, 23 Jan 2017 19:12:12 +0000 (19:12 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
am:
34b869eeea
Change-Id: I5ffe988c3affcd3afeaf3c63b5011e42ef9a4ba1
Chad Versace [Mon, 23 Jan 2017 19:12:10 +0000 (19:12 +0000)]
x11: Fix deadlock
am:
5e863331b2
Change-Id: Ic938e269f89e59fc9ab8b43c97efcb49e0317180
Tina Zhou [Mon, 23 Jan 2017 19:09:19 +0000 (19:09 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev
Tina Zhou [Mon, 23 Jan 2017 19:06:21 +0000 (19:06 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev
Kalle Raita [Sat, 21 Jan 2017 00:37:58 +0000 (00:37 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am:
59cabbec64
am:
30d7647d1a
Change-Id: Iad519b2a47b619a0e0fe828ce258ceb457c7b1d2
Kalle Raita [Sat, 21 Jan 2017 00:37:55 +0000 (00:37 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c am:
133b1f4004
am:
d027dbfab7
Change-Id: I5dbf8dae03e54892c9bf1d1e10f9553a976ca25a
Kalle Raita [Sat, 21 Jan 2017 00:37:52 +0000 (00:37 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14 am:
26033dda95
am:
a589a9c3e7
Change-Id: Iac07614345badc477a1dad0cf50258de1f0ee435
Kalle Raita [Sat, 21 Jan 2017 00:37:35 +0000 (00:37 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c am:
46a71ac84b
am:
55222675a2
Change-Id: I99a3917b5044349213f2dc0de277a348a141db6d
Kalle Raita [Sat, 21 Jan 2017 00:37:33 +0000 (00:37 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1 am:
a49a3b9496
am:
db0570a3fb
Change-Id: I02ab9fcd89302f5b8c7647dd2d8baaa0cc89b774
Kalle Raita [Sat, 21 Jan 2017 00:35:00 +0000 (00:35 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev
am:
59cabbec64
Change-Id: I4fc12577f16110122dcd4d2c5abaff4403835380
Kalle Raita [Sat, 21 Jan 2017 00:34:59 +0000 (00:34 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c
am:
133b1f4004
Change-Id: I9f0472bb2e93a25d51df3173ccea79c4b4c826c9
Kalle Raita [Sat, 21 Jan 2017 00:34:56 +0000 (00:34 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14
am:
26033dda95
Change-Id: Ie3ad754240b856142109b620bb81fa5ef104b5fe
Kalle Raita [Sat, 21 Jan 2017 00:34:37 +0000 (00:34 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682 am:
1e01d9996c
am:
46a71ac84b
Change-Id: Ic9ace513b43236bfe49f834ffef729d8040530e7
Kalle Raita [Sat, 21 Jan 2017 00:34:34 +0000 (00:34 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da am:
7e383871b1
am:
a49a3b9496
Change-Id: I918615688004719fb19964cbbe4473b0f1114086
Android Build Merger (Role) [Sat, 21 Jan 2017 00:30:49 +0000 (00:30 +0000)]
Merge changes from topic 'am-
afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev
* changes:
CP: Remove two read-backs from copy image tests am:
263e135474 am:
a691d5ca5c
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
8afffd6f14
Kalle Raita [Sat, 21 Jan 2017 00:30:36 +0000 (00:30 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474
am:
a691d5ca5c
Change-Id: I642aa8095127a59e1f8afd5f007c5f2eb8648fb9
Kalle Raita [Sat, 21 Jan 2017 00:30:35 +0000 (00:30 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474 am:
15f98c4682
am:
1e01d9996c
Change-Id: I4c822bda73622190ac818df7b6c98b1d76ebb277
Kalle Raita [Sat, 21 Jan 2017 00:30:34 +0000 (00:30 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f
am:
8afffd6f14
Change-Id: I61eb1f9bab9ae8deb773335829a6d7b20b02ad3a
Kalle Raita [Sat, 21 Jan 2017 00:30:33 +0000 (00:30 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f am:
0a8b1151da
am:
7e383871b1
Change-Id: I82784ce881898adccdb369aff0ddfdf1809b0a47
Kalle Raita [Sat, 21 Jan 2017 00:26:34 +0000 (00:26 +0000)]
CP: Remove two read-backs from copy image tests am:
263e135474
am:
15f98c4682
Change-Id: Icd48f284f4eca51f9e9a43c8e18fdbb0bf5d4329
Kalle Raita [Sat, 21 Jan 2017 00:26:32 +0000 (00:26 +0000)]
CP: Non-compressed copy image target size (64,64,8 am:
7aff1a044f
am:
0a8b1151da
Change-Id: I5e5fdb849745a918172aeeb7a02b2ea50aa5452c
Kalle Raita [Sat, 21 Jan 2017 00:23:35 +0000 (00:23 +0000)]
CP: Remove two read-backs from copy image tests
am:
263e135474
Change-Id: I9926edda54ffa5bdb0b5b7f9aeac08aab58237e8
Kalle Raita [Sat, 21 Jan 2017 00:23:33 +0000 (00:23 +0000)]
CP: Non-compressed copy image target size (64,64,8
am:
7aff1a044f
Change-Id: I55e1c77eb6558a7a396707cf541d529394be34b7
Kalle Raita [Sat, 21 Jan 2017 00:23:04 +0000 (00:23 +0000)]
CP: Remove two read-backs from copy image tests
am:
263e135474
Change-Id: I95d4c24ff9a12d774586e02e96a80bd91e045b7d
Kalle Raita [Sat, 21 Jan 2017 00:23:02 +0000 (00:23 +0000)]
CP: Non-compressed copy image target size (64,64,8
am:
7aff1a044f
Change-Id: Ie7f9febff6fb0ffa17d98ba3885fbdefb7335a6f