Kalle Raita [Mon, 6 Feb 2017 20:31:55 +0000 (20:31 +0000)]
Merge "Check NDK version in the app build script" am:
197032faf3 am:
cf0f927df4 am:
57ca78aa24
am:
331d69c679
Change-Id: Icaac46b6388bb0c2bdcc777a8ba77c9dba8a80d4
Kalle Raita [Mon, 6 Feb 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Check NDK version in the app build script" am:
197032faf3 am:
cf0f927df4
am:
57ca78aa24
Change-Id: I76faef896866241d4e9dd1fca8aafba668f568aa
Kalle Raita [Mon, 6 Feb 2017 20:26:55 +0000 (20:26 +0000)]
Merge "Check NDK version in the app build script" am:
197032faf3
am:
cf0f927df4
Change-Id: Ie9c979ff77c5edaea7d01fb510ef5ab140afeaa3
Kalle Raita [Mon, 6 Feb 2017 20:24:26 +0000 (20:24 +0000)]
Merge "Check NDK version in the app build script"
am:
197032faf3
Change-Id: I886a1b1bd45006d00035258a2d1325652a9313f7
Treehugger Robot [Mon, 6 Feb 2017 20:18:40 +0000 (20:18 +0000)]
Merge "Check NDK version in the app build script"
Kalle Raita [Wed, 1 Feb 2017 19:25:05 +0000 (11:25 -0800)]
Check NDK version in the app build script
Prevents accidentally starting build with wrong version and prints
instructions for retrieving correct NDK version.
Test: manual for current build, using r12 (wrong version), and override
Change-Id: I4a021e71261d17897bb4285ce996a758db7e5419
Pyry Haulos [Fri, 3 Feb 2017 23:37:58 +0000 (23:37 +0000)]
Android: Test that mandatory extensions are supported am:
2ef3d2cadd am:
00f38de808 am:
8d31028c39
am:
fe8dd11baf
Change-Id: Ief7fb30de32c1922f510fc9826b103fd36076d82
Pyry Haulos [Fri, 3 Feb 2017 23:35:57 +0000 (23:35 +0000)]
Android: Test that mandatory extensions are supported am:
2ef3d2cadd am:
00f38de808
am:
8d31028c39
Change-Id: If32f48cfd15d518ad5c5cb4fdf2fa78f650158c4
Pyry Haulos [Fri, 3 Feb 2017 23:33:28 +0000 (23:33 +0000)]
Android: Test that mandatory extensions are supported am:
2ef3d2cadd
am:
00f38de808
Change-Id: Ice338f46873eac5a3d6d8dfaff946e9cdceb0266
Pyry Haulos [Fri, 3 Feb 2017 23:30:57 +0000 (23:30 +0000)]
Android: Test that mandatory extensions are supported
am:
2ef3d2cadd
Change-Id: Ieba8a9ae224215d5e68fb934fede4d1e5904ee0d
Pyry Haulos [Fri, 3 Feb 2017 23:10:55 +0000 (23:10 +0000)]
Android: Test that no Vulkan layers are enumerated am:
4f0cdcd709 am:
a32b452f31 am:
0e2633c228
am:
0781553102
Change-Id: I057bb07a5ee24fd6fdeb02de6703bebcf522f65c
Pyry Haulos [Fri, 3 Feb 2017 23:08:26 +0000 (23:08 +0000)]
Android: Test that no Vulkan layers are enumerated am:
4f0cdcd709 am:
a32b452f31
am:
0e2633c228
Change-Id: I2c4a4ee4f984548716809bedff838fd025c42a97
Pyry Haulos [Fri, 3 Feb 2017 23:05:55 +0000 (23:05 +0000)]
Android: Test that no Vulkan layers are enumerated am:
4f0cdcd709
am:
a32b452f31
Change-Id: Ic118b0433d784dffbaa8f8f446a360a15df6d38e
Pyry Haulos [Fri, 3 Feb 2017 23:03:25 +0000 (23:03 +0000)]
Android: Test that no Vulkan layers are enumerated
am:
4f0cdcd709
Change-Id: I59fb804cd944ae24bc78864fb7229709eca3476e
Pyry Haulos [Fri, 3 Feb 2017 23:00:55 +0000 (23:00 +0000)]
Android: Check KHX, GOOGLE, and ANDROID extensions am:
5d9562a8c6 am:
efd1deb8d7 am:
e6d5552bb8
am:
3b132b7cb3
Change-Id: I682355a0cef8adf709f0b5c34692e3d47c21da88
Pyry Haulos [Fri, 3 Feb 2017 22:58:25 +0000 (22:58 +0000)]
Android: Check KHX, GOOGLE, and ANDROID extensions am:
5d9562a8c6 am:
efd1deb8d7
am:
e6d5552bb8
Change-Id: I5d7b4c0948ee9e69be0d6e67d8c402cf1317bbdc
Pyry Haulos [Fri, 3 Feb 2017 22:55:54 +0000 (22:55 +0000)]
Android: Check KHX, GOOGLE, and ANDROID extensions am:
5d9562a8c6
am:
efd1deb8d7
Change-Id: Iee9d734b3bb524bfeba2069e6a4e82055a7da4ac
Pyry Haulos [Fri, 3 Feb 2017 22:53:24 +0000 (22:53 +0000)]
Android: Check KHX, GOOGLE, and ANDROID extensions
am:
5d9562a8c6
Change-Id: I3149f91b93dad8801cc0e4fa05e9c19aaf2d4984
Pyry Haulos [Fri, 3 Feb 2017 21:25:48 +0000 (13:25 -0800)]
Android: Test that mandatory extensions are supported
Change-Id: Id0e44299f1d8441bf1e7ecc91d82d3b06400e7e6
Pyry Haulos [Tue, 17 Jan 2017 23:49:02 +0000 (15:49 -0800)]
Android: Test that no Vulkan layers are enumerated
Change-Id: I43dacf306b468485fc160f175160555b9cf1c86d
Pyry Haulos [Wed, 11 Jan 2017 23:02:19 +0000 (15:02 -0800)]
Android: Check KHX, GOOGLE, and ANDROID extensions
Change-Id: I6ee24e584666e1f2542adf35943a2973c9392ad9
Pyry Haulos [Tue, 31 Jan 2017 01:55:38 +0000 (01:55 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2" am:
8de4af67bb am:
b3191e5847 am:
eab06747e6
am:
a57d2a88f8
Change-Id: I4362eb80aaa0a18a89ca59edd35e0145980c0066
Pyry Haulos [Tue, 31 Jan 2017 01:53:07 +0000 (01:53 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2" am:
8de4af67bb am:
b3191e5847
am:
eab06747e6
Change-Id: I5215c23f56416f961425db6ac09cee45a0bdddae
Pyry Haulos [Tue, 31 Jan 2017 01:51:07 +0000 (01:51 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2" am:
8de4af67bb
am:
b3191e5847
Change-Id: Ia6d3877821be9d31771445efe2ad382645dda568
Pyry Haulos [Tue, 31 Jan 2017 01:48:37 +0000 (01:48 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2"
am:
8de4af67bb
Change-Id: I2accdd355e2d34d9d808ffb9b93afec01d0d345d
Treehugger Robot [Tue, 31 Jan 2017 01:45:31 +0000 (01:45 +0000)]
Merge "Update Android CTS Vulkan mustpass to match 1.0.2"
Michael Hadley [Tue, 31 Jan 2017 00:35:35 +0000 (00:35 +0000)]
Added gl_BoundingBox built-in type access tests am:
ed63f60eb4 am:
2160941ec7 am:
b784ed3d7b
am:
5f5f4b0a64
Change-Id: I809865301d76dae2d75b1274d1e27651084809bb
Michael Hadley [Tue, 31 Jan 2017 00:35:31 +0000 (00:35 +0000)]
Add SSBO block tests am:
04ba289d6e am:
ce0a6e4b7b am:
375a437841
am:
a27e5f265d
Change-Id: I67aebbebcb6946dbf828d7bf3a5dd0ab8c749d15
Michael Hadley [Tue, 31 Jan 2017 00:33:07 +0000 (00:33 +0000)]
Added gl_BoundingBox built-in type access tests am:
ed63f60eb4 am:
2160941ec7
am:
b784ed3d7b
Change-Id: I0be84ee47830fd4264db5865d5851792ebdf290b
Michael Hadley [Tue, 31 Jan 2017 00:33:02 +0000 (00:33 +0000)]
Add SSBO block tests am:
04ba289d6e am:
ce0a6e4b7b
am:
375a437841
Change-Id: I71203b5172bbd9d03b295ceba1d607ab9fa66675
Michael Hadley [Tue, 31 Jan 2017 00:31:04 +0000 (00:31 +0000)]
Added gl_BoundingBox built-in type access tests am:
ed63f60eb4
am:
2160941ec7
Change-Id: I8b40a4290decf450cacbd43ea00db90f6f64f2bb
Michael Hadley [Tue, 31 Jan 2017 00:31:01 +0000 (00:31 +0000)]
Add SSBO block tests am:
04ba289d6e
am:
ce0a6e4b7b
Change-Id: I3a786919bca07ae6f5a4be0c5f5dd992ec3256a7
Michael Hadley [Tue, 31 Jan 2017 00:28:34 +0000 (00:28 +0000)]
Added gl_BoundingBox built-in type access tests
am:
ed63f60eb4
Change-Id: I1d0700b52ee7dfbd51f7e7165df01696d6b299cf
Michael Hadley [Tue, 31 Jan 2017 00:28:32 +0000 (00:28 +0000)]
Add SSBO block tests
am:
04ba289d6e
Change-Id: I33095ab7cebe48f0941370bf9d0b6c576a90c464
Pyry Haulos [Tue, 31 Jan 2017 00:02:32 +0000 (16:02 -0800)]
Update Android CTS Vulkan mustpass to match 1.0.2
This CL updates Android CTS mustpass for Vulkan to match Khronos Vulkan
CTS 1.0.2.0.
Change-Id: Ia2f82b5f6675c67940679eb98f59510f264d62bf
Michael Hadley [Wed, 14 Dec 2016 20:08:59 +0000 (20:08 +0000)]
Added gl_BoundingBox built-in type access tests
New tests:
- dEQP-GLES31.functional.debug.negative_coverage.callbacks.shader_directive.accessing_bounding_box_type
Change-Id: I8f47dfdfde631f36f6a515459867b59e3c210701
Michael Hadley [Thu, 1 Dec 2016 17:52:17 +0000 (17:52 +0000)]
Add SSBO block tests
New Tests:
- dEQP-GLES31.functional.debug.negative_coverage.callbacks.ssbo_block.ssbo_block.*
Change-Id: I60d52bc34d9211e93332dcc719535f1f5e4a0596
John Richardson [Mon, 30 Jan 2017 20:50:56 +0000 (20:50 +0000)]
Add tessellation shader stages to negative layout_binding tests am:
b7272b0934 am:
234af40a4f am:
7db3ca77ea
am:
70767a5308
Change-Id: I1f0449f1b47eb67de1c97144b46f0271ba1504ba
John Richardson [Mon, 30 Jan 2017 20:50:45 +0000 (20:50 +0000)]
Add new tessellation negative coverage tests am:
1889817926 am:
6505a995c1 am:
02e452454c
am:
91623e041e
Change-Id: I42756cb766e67896ec7d15afa0f6e1817c102212
John Richardson [Mon, 30 Jan 2017 20:48:24 +0000 (20:48 +0000)]
Add tessellation shader stages to negative layout_binding tests am:
b7272b0934 am:
234af40a4f
am:
7db3ca77ea
Change-Id: Ia5ff0d8f6ca0482059afbf9af0293f1cd20f6c8c
John Richardson [Mon, 30 Jan 2017 20:48:14 +0000 (20:48 +0000)]
Add new tessellation negative coverage tests am:
1889817926 am:
6505a995c1
am:
02e452454c
Change-Id: Ie80c9550edb2f72667248cd7c5d0d122f49da66c
John Richardson [Mon, 30 Jan 2017 20:46:25 +0000 (20:46 +0000)]
Add tessellation shader stages to negative layout_binding tests am:
b7272b0934
am:
234af40a4f
Change-Id: I04d9dbd56ec699b876b36d7ba8ac7894cfa81101
John Richardson [Mon, 30 Jan 2017 20:46:14 +0000 (20:46 +0000)]
Add new tessellation negative coverage tests am:
1889817926
am:
6505a995c1
Change-Id: Ic1c997496e29598e0a889ddbc0c260746b60ea00
John Richardson [Mon, 30 Jan 2017 20:43:56 +0000 (20:43 +0000)]
Add tessellation shader stages to negative layout_binding tests
am:
b7272b0934
Change-Id: I7b698194e1b617fa6c0e31ba437c1586f2c01a44
John Richardson [Mon, 30 Jan 2017 20:43:44 +0000 (20:43 +0000)]
Add new tessellation negative coverage tests
am:
1889817926
Change-Id: I8f4b76d0c37c88c45512352502ed138acc095fc4
John Richardson [Wed, 23 Nov 2016 14:48:32 +0000 (14:48 +0000)]
Add tessellation shader stages to negative layout_binding tests
Tests groups added to:
- dEQP-GLES31.functional.layout_binding.negative.sampler.sampler2d.*.
- dEQP-GLES31.functional.layout_binding.negative.sampler.sampler3d.*.
- dEQP-GLES31.functional.layout_binding.negative.ubo.*.
- dEQP-GLES31.functional.layout_binding.negative.ssbo.*.
- dEQP-GLES31.functional.layout_binding.negative.image.image2d.*.
- dEQP-GLES31.functional.layout_binding.negative.image.image3d.*.
New tests (tess_control, tess_evalution):
- binding_neg
- binding_over_max
- binding_neg_array
- binding_over_max_array
Extended tests:
- binding_contradictory
- binding_contradictory_array
Change-Id: Ia6b66f1d5316e3bba376a8aea189074b60fbedb5
John Richardson [Wed, 9 Nov 2016 08:34:43 +0000 (08:34 +0000)]
Add new tessellation negative coverage tests
Test groups added to:
- dEQP-GLES31.functional.shaders.linkage.tessellation.varying.rules
- dEQP-GLES31.functional.shaders.linkage.tessellation.layout_declarations.rules (new)
- dEQP-GLES31.functional.shaders.linkage.tessellation.barriers.rules (new)
- dEQP-GLES31.functional.debug.negative_coverage.*.tessellation (new)
New tests:
- output_non_array
- invalid_patch_in_usage
- invalid_patch_out_usage
- invalid_per_patch_qualifier_usage
- output_block_non_array
- invalid_barrier_usage_within_control_flow
- invalid_barrier_usage_after_return
- primitive_mode_mismatch
- spacing_mode_mismatch
- vertex_order_mismatch
- vertex_count_mismatch
- single_tessellation_stage
- invalid_primitive_mode
- tessellation_not_active
- invalid_program_state
- get_programiv
- invalid_program_queries
- tessellation_control_invalid_vertex_count
Change-Id: I0c4f4b407bfe80e09546af51fdb2d184cf310757
Xin Li [Thu, 26 Jan 2017 21:18:43 +0000 (21:18 +0000)]
Merge nougat-mr1-cts-dev into am:
2dcacdbe0a am:
b196334de5 am:
769492af1d
am:
03c2353df4
Change-Id: If0747a902df6137c01ebae58e440fe262dfc6a3b
Xin Li [Thu, 26 Jan 2017 21:15:27 +0000 (21:15 +0000)]
Merge nougat-mr1-cts-dev into am:
2dcacdbe0a am:
b196334de5
am:
769492af1d
Change-Id: Ic9c6eec0b2d1cee2c2efa20531720eb6fb77745b
Xin Li [Thu, 26 Jan 2017 21:12:27 +0000 (21:12 +0000)]
Merge nougat-mr1-cts-dev into am:
2dcacdbe0a
am:
b196334de5
Change-Id: I28d200d6322de752529169cc1960379774f4fd7f
Xin Li [Thu, 26 Jan 2017 21:09:27 +0000 (21:09 +0000)]
Merge nougat-mr1-cts-dev into master.
am:
2dcacdbe0a
Change-Id: I4d80ab4fe02c0c7209365b08bf64358f6f7979e8
Xin Li [Thu, 26 Jan 2017 20:47:01 +0000 (20:47 +0000)]
Skip commit '
c5bbebc46ac7725d43692602422ee3fc76cac7b0' on am:
b1fa5e8f2c am:
ef0c4176d6 am:
4f65cf0bba
am:
e9b300de33
Change-Id: If90f72311f1d7bb6b84c95a4cf2818b3b60d3d0e
Xin Li [Thu, 26 Jan 2017 20:46:52 +0000 (20:46 +0000)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to am:
04974c3449 am:
1f9853e006 am:
e9a25e7e34
am:
045eb76c67
Change-Id: I8f0e89b2b3cd4e75425be560e5ed578a80817119
Xin Li [Thu, 26 Jan 2017 20:40:27 +0000 (20:40 +0000)]
Skip commit '
c5bbebc46ac7725d43692602422ee3fc76cac7b0' on am:
b1fa5e8f2c am:
ef0c4176d6
am:
4f65cf0bba
Change-Id: I71cedd451ef3bd6e29f8ece5025c4603defc2091
Xin Li [Thu, 26 Jan 2017 20:40:20 +0000 (20:40 +0000)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to am:
04974c3449 am:
1f9853e006
am:
e9a25e7e34
Change-Id: Ib75bb206d5423e89bf53b3011ab918ec41f8046b
Xin Li [Thu, 26 Jan 2017 20:37:32 +0000 (20:37 +0000)]
Skip commit '
c5bbebc46ac7725d43692602422ee3fc76cac7b0' on am:
b1fa5e8f2c
am:
ef0c4176d6
Change-Id: I722cc549948cf2de67e6f73e9567c1fd60b81dd3
Xin Li [Thu, 26 Jan 2017 20:37:23 +0000 (20:37 +0000)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to am:
04974c3449
am:
1f9853e006
Change-Id: I17f55595d2971b1fc98cda86a96d8bba4880dcc1
Xin Li [Thu, 26 Jan 2017 20:34:33 +0000 (20:34 +0000)]
Skip commit '
c5bbebc46ac7725d43692602422ee3fc76cac7b0' on
am:
b1fa5e8f2c
Change-Id: If4100aebe657cc11438526fc0d0151d4158e2372
Xin Li [Thu, 26 Jan 2017 20:34:22 +0000 (20:34 +0000)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to
am:
04974c3449
Change-Id: Idd92a7eeffaa2a6aec507dc3c886a6f08eea47be
Xin Li [Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)]
Merge nougat-mr1-cts-dev into master.
Xin Li [Thu, 26 Jan 2017 18:53:54 +0000 (10:53 -0800)]
Xin Li [Thu, 26 Jan 2017 18:28:31 +0000 (10:28 -0800)]
Merge commit '
2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
nougat-cts-mr1-dev to master.
Change-Id: I9ad6799aaae603a05c0cc65bcff60df8bff88a95
Pyry Haulos [Tue, 24 Jan 2017 23:27:57 +0000 (23:27 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float am:
54c090f981 am:
225e1e1eb7 am:
f7c70217d6
am:
1969316fda
Change-Id: I3bdf45499e3a988b9a9af70dd761b1c902214efa
Pyry Haulos [Tue, 24 Jan 2017 23:27:51 +0000 (23:27 +0000)]
Add basic test for EGL_KHR_no_config_context am:
d7ec39dd04 am:
a05826c329 am:
726be5f657
am:
fa43529a16
Change-Id: I1a4efedff6909327a8729269d0e5949137b065bb
Pyry Haulos [Tue, 24 Jan 2017 23:25:55 +0000 (23:25 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float am:
54c090f981 am:
225e1e1eb7
am:
f7c70217d6
Change-Id: Ib8f1f8aba7758c82266e4b32ad33fe1f0336867e
Pyry Haulos [Tue, 24 Jan 2017 23:25:52 +0000 (23:25 +0000)]
Add basic test for EGL_KHR_no_config_context am:
d7ec39dd04 am:
a05826c329
am:
726be5f657
Change-Id: Idd4cbec6935fb1fbbc465aa0e416258033002e4c
Pyry Haulos [Tue, 24 Jan 2017 23:23:24 +0000 (23:23 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float am:
54c090f981
am:
225e1e1eb7
Change-Id: I9fdd2a30032317a761150e5f7f3bf51f31d4ff37
Pyry Haulos [Tue, 24 Jan 2017 23:23:21 +0000 (23:23 +0000)]
Add basic test for EGL_KHR_no_config_context am:
d7ec39dd04
am:
a05826c329
Change-Id: I136e25b6981efdba8aeebce666a7f8bd516da486
Pyry Haulos [Tue, 24 Jan 2017 23:21:22 +0000 (23:21 +0000)]
Add eglChooseConfig() tests for EXT_pixel_format_float
am:
54c090f981
Change-Id: I03e6ac5098e24cdf1234734412b485ef8ba6e9a2
Pyry Haulos [Tue, 24 Jan 2017 23:21:20 +0000 (23:21 +0000)]
Add basic test for EGL_KHR_no_config_context
am:
d7ec39dd04
Change-Id: I8d311d08ebdb37f1eb81e1a22b14b587d0b31357
Pyry Haulos [Fri, 20 Jan 2017 18:30:13 +0000 (10:30 -0800)]
Add eglChooseConfig() tests for EXT_pixel_format_float
These tests verify that eglChooseConfig() filters configs correctly
based on EGL_COLOR_COMPONENT_TYPE_EXT attribute.
Change-Id: Icaaffee69dd46a9044149c01c8fe8b7ec8928305
Pyry Haulos [Fri, 20 Jan 2017 19:04:46 +0000 (11:04 -0800)]
Add basic test for EGL_KHR_no_config_context
Change-Id: I14aa3f38ea8d2aaa224c13a992d41cf5ef546f6e
Pyry Haulos [Tue, 24 Jan 2017 19:50:11 +0000 (19:50 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
68408cad8f am:
81e6e20395 am:
65d27d1ecb
am:
9b38704f93
Change-Id: Ibd1cf9eb7a4d1b848db67eff39b49ccb1f0eac33
Pyry Haulos [Tue, 24 Jan 2017 19:48:12 +0000 (19:48 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
68408cad8f am:
81e6e20395
am:
65d27d1ecb
Change-Id: I888b7e7d8168e0aa004fb708ca6eb9bf42a68e6a
Pyry Haulos [Tue, 24 Jan 2017 19:45:39 +0000 (19:45 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am:
68408cad8f
am:
81e6e20395
Change-Id: Ia2a6111596af7621485b406da9ad5b046f8a43d5
Pyry Haulos [Tue, 24 Jan 2017 19:43:39 +0000 (19:43 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
68408cad8f
Change-Id: I80f0e00e63ebbfe674b4f5d60e5da1a72084066b
Pyry Haulos [Tue, 24 Jan 2017 17:07:51 +0000 (09:07 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: Ifee45dee9fe57a8386c468dfedfb822c329f2504
Tina Zhou [Mon, 23 Jan 2017 20:05:56 +0000 (20:05 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
63b680c857" into nyc-mr2-dev-plus-aosp
am:
6d932de5ea
Change-Id: I8f9f73e95335f76760d7c02e74e34b5f4e6ee0cd
Tina Zhou [Mon, 23 Jan 2017 20:05:50 +0000 (20:05 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
63b680c857
am:
36fde730bf
Change-Id: Id560b6ea071a652a4aabf800fd474ebeae711904
Chad Versace [Mon, 23 Jan 2017 20:05:13 +0000 (20:05 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
e5286dbaf7" into nyc-mr2-dev-plus-aosp
am:
ca30439bc2
Change-Id: I14488e161d64bccdfce212f9316a9512bf15ac7e
Chad Versace [Mon, 23 Jan 2017 20:05:10 +0000 (20:05 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
e5286dbaf7
am:
8d7c277158
Change-Id: I7ecec175ad8d5032c110cb99a1bdaf01045001ed
Tina Zhou [Mon, 23 Jan 2017 20:04:45 +0000 (20:04 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
120b5fb421" into nyc-mr2-dev-plus-aosp
am:
305270d6d6
Change-Id: Ieec0626951d0d7344b4057a8d86ffdf91d90fc06
Tina Zhou [Mon, 23 Jan 2017 20:04:44 +0000 (20:04 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15 am:
120b5fb421
am:
7dcbcecdc3
Change-Id: Iaff0c8e967a930b0231a32ffc95bd5bd3e622bd9
Tina Zhou [Mon, 23 Jan 2017 20:04:21 +0000 (20:04 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
100bd75cb7" into nyc-mr2-dev-plus-aosp
am:
6cf94e941b
Change-Id: Ie2e307010f7bef574a5a2b97364f7a4f8e42a745
Tina Zhou [Mon, 23 Jan 2017 20:04:19 +0000 (20:04 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
100bd75cb7
am:
0520585424
Change-Id: I4dbf6304cc45abed3baee0da9ae7b16d0d3702d5
Chad Versace [Mon, 23 Jan 2017 20:03:56 +0000 (20:03 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
b57d3123ac" into nyc-mr2-dev-plus-aosp
am:
c3ee6c9e59
Change-Id: I5620382b9fd5489a2622bcad5f864b63d92b47be
Chad Versace [Mon, 23 Jan 2017 20:03:55 +0000 (20:03 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
b57d3123ac
am:
a3d1fd9bc6
Change-Id: I8f3e84cc2427c32b305581369511e0435479c31a
Chad Versace [Mon, 23 Jan 2017 20:03:35 +0000 (20:03 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
ab54c5b0ef" into nyc-mr2-dev-plus-aosp
am:
a366b6e884
Change-Id: I062cdcc67d83d37c5ccf2d4eb8a36a93f82e807c
Chad Versace [Mon, 23 Jan 2017 20:03:34 +0000 (20:03 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
ab54c5b0ef
am:
5e2981c0c7
Change-Id: I61594168ba0ac06d836e98990d5d89f73cd4b9ef
Tina Zhou [Mon, 23 Jan 2017 20:03:09 +0000 (20:03 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
b969431bfd" into nyc-mr2-dev-plus-aosp
am:
417cdbb829
Change-Id: Id426de0938d681c6e452a21f7d282d3e0650a2fd
Tina Zhou [Mon, 23 Jan 2017 20:03:07 +0000 (20:03 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8 am:
b969431bfd
am:
f837b00a7e
Change-Id: I9157aae61b5ed75d464a65b8fd3eca4f31e4cd33
Tina Zhou [Mon, 23 Jan 2017 20:02:44 +0000 (20:02 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
ac78f3c5b7" into nyc-mr2-dev-plus-aosp
am:
508ef296d8
Change-Id: I5552601eb03363358a254539af5876eb99c80318
Tina Zhou [Mon, 23 Jan 2017 20:02:39 +0000 (20:02 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
ac78f3c5b7
am:
5f2ae2d09c
Change-Id: Ibd788cacb6c4c1ebd71f31af5c9b48a3a0c143f1
Chad Versace [Mon, 23 Jan 2017 20:02:09 +0000 (20:02 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
8b86967b6f" into nyc-mr2-dev-plus-aosp
am:
e5b8804c39
Change-Id: I5db3ec87559ca4d31bccf001c7bfc8cf74bf2710
Chad Versace [Mon, 23 Jan 2017 20:02:05 +0000 (20:02 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
8b86967b6f
am:
d7d2897995
Change-Id: I1d8466836c0c1d41fa05ee0d01b2889e585166be
Chad Versace [Mon, 23 Jan 2017 20:01:36 +0000 (20:01 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
9c925d6e4b" into nyc-mr2-dev-plus-aosp
am:
85a4283f70
Change-Id: I92b61e69891bb75f6462d86a04e95756621fcb07
Chad Versace [Mon, 23 Jan 2017 20:01:30 +0000 (20:01 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
9c925d6e4b
am:
064f3b12bf
Change-Id: Iac58887a35f9793cacadce25d155f21b7f27f95f
Tina Zhou [Mon, 23 Jan 2017 20:00:59 +0000 (20:00 +0000)]
Merge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
e775b6f623" into nyc-mr2-dev-plus-aosp
am:
33b8a60c2e
Change-Id: I56fd8e498a53b931fbf9bfa134fd22d34fe801ae
Tina Zhou [Mon, 23 Jan 2017 20:00:54 +0000 (20:00 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8 am:
e775b6f623
am:
ebd824c364
Change-Id: Iebe948e728851efbc37f409d2efbcd42efcb01a7
Tina Zhou [Mon, 23 Jan 2017 20:00:21 +0000 (20:00 +0000)]
Merge "Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526 am:
243a52b3c7" into nyc-mr2-dev-plus-aosp
am:
513d6ae450
Change-Id: I6d4d2fd9ee3f435b8ec891e3715978033e665fd3