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: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: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: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
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:36 +0000 (19:55 +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
Tina Zhou [Mon, 23 Jan 2017 19:55:28 +0000 (19:55 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15
am:
63b680c857
Change-Id: Ic0e2be5565045db085ba67326572b230ad874fd5
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:19 +0000 (19:55 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
e5286dbaf7" into nyc-mr2-dev-plus-aosp
Chad Versace [Mon, 23 Jan 2017 19:55:11 +0000 (19:55 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671
am:
e5286dbaf7
Change-Id: Ic7c13f85a75875f5295360200ebddd1e198fc064
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:09 +0000 (19:55 +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
Android Build Merger (Role) [Mon, 23 Jan 2017 19:55:03 +0000 (19:55 +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
Tina Zhou [Mon, 23 Jan 2017 19:55:02 +0000 (19:55 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca am:
bb7e6b4f15
am:
120b5fb421
Change-Id: Ic2d80a109db0037a8e399935f6ee565cbee19e76
Tina Zhou [Mon, 23 Jan 2017 19:54:56 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8
am:
100bd75cb7
Change-Id: Iadf1e0c66d1eb783f4ba06f05d9f4761ad7a4ff2
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:56 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671 am:
b57d3123ac" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:51 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
ab54c5b0ef" into nyc-mr2-dev-plus-aosp
Chad Versace [Mon, 23 Jan 2017 19:54:49 +0000 (19:54 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9 am:
587123a671
am:
b57d3123ac
Change-Id: I1a0587e87848589b15961c4ca7b4508bd95fcf47
Chad Versace [Mon, 23 Jan 2017 19:54:45 +0000 (19:54 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a
am:
ab54c5b0ef
Change-Id: Ic5a53f171405f0d983b8460835f358881efd4427
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:44 +0000 (19:54 +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
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:39 +0000 (19:54 +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
Tina Zhou [Mon, 23 Jan 2017 19:54:37 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0 am:
d737e16da8
am:
b969431bfd
Change-Id: I845abdddf5abbb505dbdfbd939d2f6285e7ee0da
Tina Zhou [Mon, 23 Jan 2017 19:54:31 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8
am:
ac78f3c5b7
Change-Id: I79cb795f0224730897b2c7686d7c780c8549fc13
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:31 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a am:
8b86967b6f" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:25 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
9c925d6e4b" into nyc-mr2-dev-plus-aosp
Chad Versace [Mon, 23 Jan 2017 19:54:24 +0000 (19:54 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd am:
97cc16aa0a
am:
8b86967b6f
Change-Id: Iae536afd28f2bc3f5f4b6997f32813989b387e7c
Chad Versace [Mon, 23 Jan 2017 19:54:19 +0000 (19:54 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b
am:
9c925d6e4b
Change-Id: I4ddd26d42910a4c89b6935a60ea287fee53f339a
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:18 +0000 (19:54 +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
Tina Zhou [Mon, 23 Jan 2017 19:54:12 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a am:
40ff9476c8
am:
e775b6f623
Change-Id: I089e912a67bdac73c08569b34356a7ad205b68d7
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:09 +0000 (19:54 +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
Android Build Merger (Role) [Mon, 23 Jan 2017 19:54:07 +0000 (19:54 +0000)]
Merge "x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b am:
6d9bd5e858" into nyc-mr2-dev-plus-aosp
Tina Zhou [Mon, 23 Jan 2017 19:54:02 +0000 (19:54 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526
am:
243a52b3c7
Change-Id: Ic16c4f83b7c340b0685d11a1cebb2b6abcf938dd
Chad Versace [Mon, 23 Jan 2017 19:54:00 +0000 (19:54 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48 am:
c6bf22467b
am:
6d9bd5e858
Change-Id: I22709bd75e0b1bb4cfc42ab0b2bf74b912f993ce
Android Build Merger (Role) [Mon, 23 Jan 2017 19:53:57 +0000 (19:53 +0000)]
Merge "x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6 am:
a2c167bef6" into nyc-mr2-dev-plus-aosp
Chad Versace [Mon, 23 Jan 2017 19:53:50 +0000 (19:53 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6
am:
a2c167bef6
Change-Id: I349e1177e9026bfcc78ab4cb25d27d11a4d11031
Tina Zhou [Mon, 23 Jan 2017 19:53:46 +0000 (19:53 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509 am:
ce18fbd526
am:
aee042a887
Change-Id: I44fe76bc54ae72df6bb2754e6d0369c0aef5bfb5
Chad Versace [Mon, 23 Jan 2017 19:53:34 +0000 (19:53 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4 am:
c1c16c73e6
am:
5a37f3c8ca
Change-Id: I5fa4924235db443b75777bf8896d29bbcc1cff19
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:45:33 +0000 (19:45 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a74d50ffda am:
b92f7d676f am:
d46ac1a0ca
am:
bb7e6b4f15
Change-Id: I2ee13c332f808a952055d23e58daecbf42f6cdc6
Chad Versace [Mon, 23 Jan 2017 19:45:17 +0000 (19:45 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
f465d82fa5 am:
0ed6cc912e am:
e7ee6541a9
am:
587123a671
Change-Id: I204cbf00315effedd04ec616a9c4ddb51ae20e2e
Tina Zhou [Mon, 23 Jan 2017 19:45:01 +0000 (19:45 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
05f26155f0 am:
7bb5047d5e am:
1b341143c0
am:
d737e16da8
Change-Id: I1f2ecb78180c0f911844355d7ca838642d22b770
Chad Versace [Mon, 23 Jan 2017 19:44:49 +0000 (19:44 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
7d0ad652ff am:
ca5a475223 am:
319a51d5dd
am:
97cc16aa0a
Change-Id: I506baa320008c9b3f38ba7cc1934946fa11b9dde
Tina Zhou [Mon, 23 Jan 2017 19:44:35 +0000 (19:44 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
6aef236dd0 am:
f23a03362a
am:
40ff9476c8
Change-Id: I0e2c458fead527c19754665a6230c3575488f67c
Chad Versace [Mon, 23 Jan 2017 19:44:17 +0000 (19:44 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
0fe4efcfa8 am:
8c04df2e48
am:
c6bf22467b
Change-Id: Iaa3af04f0f5d8199b2bdb3e77d61f9c7712a652a
Tina Zhou [Mon, 23 Jan 2017 19:44:04 +0000 (19:44 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
b6766f9949 am:
7b1b2f4509
am:
ce18fbd526
Change-Id: I09e8f4fb4dfc224e48334540dc507fee18ee9368
Chad Versace [Mon, 23 Jan 2017 19:43:51 +0000 (19:43 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
f49e8bfc0e am:
1eb4f43dc4
am:
c1c16c73e6
Change-Id: Icb646126efe9305543fea1668983d89b53035a32
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:31:06 +0000 (19:31 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a6f61be6c3 am:
63d6f4041f
am:
977c4c7527
Change-Id: I8d2f5aa3ffe405ebb19d2272236424db296f44db
Chad Versace [Mon, 23 Jan 2017 19:30:54 +0000 (19:30 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
91a1b97b09 am:
f7dc04d927
am:
7e99d9d115
Change-Id: I024be90e622cc911dd6894bc0c56b4a6696611e6
Tina Zhou [Mon, 23 Jan 2017 19:30:41 +0000 (19:30 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
f1dcdc55d5 am:
011e9a2331
am:
2c73a05f63
Change-Id: If5bcc89c40b88306261cfad15e80f3d7d74f47b1
Chad Versace [Mon, 23 Jan 2017 19:30:30 +0000 (19:30 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
cef17b4f69 am:
cc7bb08734
am:
2e6b99b9f2
Change-Id: I5f3e1e154d6427f0091b9d2a3710fe1fc7cf71f6
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:26:32 +0000 (19:26 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222 am:
a6f61be6c3
am:
63d6f4041f
Change-Id: I79544764c0d1fabba79afd3becfd1ab7509b444f
Chad Versace [Mon, 23 Jan 2017 19:26:20 +0000 (19:26 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0 am:
91a1b97b09
am:
f7dc04d927
Change-Id: I01428702676d7f668336ca5a4ccd1766c7df92af
Tina Zhou [Mon, 23 Jan 2017 19:26:10 +0000 (19:26 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea am:
f1dcdc55d5
am:
011e9a2331
Change-Id: I22272cc5f66c360d4bb6245dbd9f806414c49ae7
Chad Versace [Mon, 23 Jan 2017 19:25:59 +0000 (19:25 +0000)]
x11: Fix deadlock am:
5e863331b2 am:
cef17b4f69
am:
cc7bb08734
Change-Id: I535072d2ce803040e456bc03e7a7b735b568a3d3
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:38 +0000 (19:22 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am:
cbdbf95222
am:
a6f61be6c3
Change-Id: I8f6e08168004906b53c8317556bbad339aea875e
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:25 +0000 (19:22 +0000)]
x11: Call XInitThreads() am:
5d11c9d2c0
am:
91a1b97b09
Change-Id: I91ec061ca04588ab8fc0d14b881f5ee77218994c
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:13 +0000 (19:22 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am:
34b869eeea
am:
f1dcdc55d5
Change-Id: Ic823ceca5963c2fcb5ab4be0324cb57cfb102561
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:22:02 +0000 (19:22 +0000)]
x11: Fix deadlock am:
5e863331b2
am:
cef17b4f69
Change-Id: Ib421c76250a51295f84e792c095128e7f065aaba
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