platform/upstream/VK-GL-CTS.git
7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
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

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9...
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

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
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

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
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

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
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

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
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

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b...
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

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
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

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
Tina Zhou [Mon, 23 Jan 2017 20:00:17 +0000 (20:00 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: 243a52b3c7
am: b2b1341dbf

Change-Id: I5e025c77c065511b2ba6ef04f13488328c2a586c

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
Chad Versace [Mon, 23 Jan 2017 19:59:50 +0000 (19:59 +0000)]
Merge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b am: 6d9bd5e858" into nyc-mr2-dev-plus-aosp
am: 8e18c56bea

Change-Id: Idb546dd37bf11918260994f428be9445f7aa0583

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b...
Chad Versace [Mon, 23 Jan 2017 19:59:49 +0000 (19:59 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b am: 6d9bd5e858
am: c0ae8e7cc0

Change-Id: I893e6fb313dcd1ba4e45cbb78454e2582551d690

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6...
Chad Versace [Mon, 23 Jan 2017 19:59:29 +0000 (19:59 +0000)]
Merge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am: a2c167bef6" into nyc-mr2-dev-plus-aosp
am: 5655d18351

Change-Id: I9ee4d8c127897934566ccbfabe7ee8cab4562cea

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am...
Chad Versace [Mon, 23 Jan 2017 19:59:28 +0000 (19:59 +0000)]
x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am: a2c167bef6
am: 3ce8a6bb44

Change-Id: Id45197e2ce58aaf24c489f6fec5dd6d1cffbb608

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
Tina Zhou [Mon, 23 Jan 2017 19:59:11 +0000 (19:59 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2f4509 am: ce18fbd526 am: aee042a887
am: e721cf66ec

Change-Id: Ia4d02e6649ac403a91526ef28b37216b08556c33

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am...
Chad Versace [Mon, 23 Jan 2017 19:59:00 +0000 (19:59 +0000)]
x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6 am: 5a37f3c8ca
am: dc23d8bda4

Change-Id: I43a1b907077450ff10bbcf4bcacde29a2d923469

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
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

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am:...
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

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
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

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0...
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

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
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

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd...
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

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd am...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b
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

7 years agoMerge "Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef23...
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
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

7 years agoMerge "Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949...
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

7 years agoMerge "x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am:...
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48 am: c6bf22467b
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

7 years agoMerge "x11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4 am: c1c16c73e6
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e am: e7ee6541a9
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223 am: 319a51d5dd
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8 am: 8c04df2e48
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949 am: 7b1b2...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e am: 1eb4f43dc4
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5 am: 0ed6cc912e
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0 am: 7bb50...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff am: ca5a475223
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: 6aef236dd0
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: b6766f9949
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

7 years agox11: Fix deadlock am: 5e863331b2 am: f49e8bfc0e
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a6f61be6c3...
Tina Zhou [Mon, 23 Jan 2017 19:35:31 +0000 (19:35 +0000)]
Merge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a6f61be6c3 am: 63d6f4041f am: 977c4c7527
am: 99638edf78

Change-Id: I31aced78954e05bba3192046e13445c1100f34ed

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 91a1b97b09 am: f7dc04d927 am: 7e99d9d115
Chad Versace [Mon, 23 Jan 2017 19:35:19 +0000 (19:35 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0 am: 91a1b97b09 am: f7dc04d927 am: 7e99d9d115
am: 5ce2636243

Change-Id: Ibd9c762d88cab2b4903736335e4bf22f9d90c5a0

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9...
Tina Zhou [Mon, 23 Jan 2017 19:35:05 +0000 (19:35 +0000)]
Merge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9a2331 am: 2c73a05f63
am: 7212d76131

Change-Id: I37020291dc4fe7447c096bf451ce6ef197d3f7a3

7 years agox11: Fix deadlock am: 5e863331b2 am: cef17b4f69 am: cc7bb08734 am: 2e6b99b9f2
Chad Versace [Mon, 23 Jan 2017 19:34:52 +0000 (19:34 +0000)]
x11: Fix deadlock am: 5e863331b2 am: cef17b4f69 am: cc7bb08734 am: 2e6b99b9f2
am: df22ad0da3

Change-Id: I694c9fd2cfad383c47d546bf90301f6566b1f980

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a6f61be6c3...
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 91a1b97b09 am: f7dc04d927
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5 am: 011e9...
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

7 years agox11: Fix deadlock am: 5e863331b2 am: cef17b4f69 am: cc7bb08734
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: f465d82fa5
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: 05f26155f0
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

7 years agox11: Fix deadlock am: 5e863331b2 am: 7d0ad652ff
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222 am: a6f61be6c3
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0 am: 91a1b97b09
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea am: f1dcdc55d5
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

7 years agox11: Fix deadlock am: 5e863331b2 am: cef17b4f69
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

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0
Chad Versace [Mon, 23 Jan 2017 19:24:52 +0000 (19:24 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0
am: 0fe4efcfa8

Change-Id: Ibea958c446ac219b635df4bf33e799603c02edba

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
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

7 years agox11: Fix deadlock am: 5e863331b2
Chad Versace [Mon, 23 Jan 2017 19:24:25 +0000 (19:24 +0000)]
x11: Fix deadlock am: 5e863331b2
am: f49e8bfc0e

Change-Id: I369a74b5b264d481506b413fcacc1f845c3ab68f

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev am: cbdbf95222
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

7 years agox11: Call XInitThreads() am: 5d11c9d2c0
Chad Versace [Mon, 23 Jan 2017 19:22:25 +0000 (19:22 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0
am: 91a1b97b09

Change-Id: I91ec061ca04588ab8fc0d14b881f5ee77218994c

7 years agox11: Call XInitThreads() am: 5d11c9d2c0
Chad Versace [Mon, 23 Jan 2017 19:22:22 +0000 (19:22 +0000)]
x11: Call XInitThreads() am: 5d11c9d2c0
am: f465d82fa5

Change-Id: I96a8a4bd5fe510d2a1109512b9347e8e57a54b6b

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
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

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev am: 34b869eeea
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

7 years agox11: Fix deadlock am: 5e863331b2
Chad Versace [Mon, 23 Jan 2017 19:22:02 +0000 (19:22 +0000)]
x11: Fix deadlock am: 5e863331b2
am: cef17b4f69

Change-Id: Ib421c76250a51295f84e792c095128e7f065aaba

7 years agox11: Fix deadlock am: 5e863331b2
Chad Versace [Mon, 23 Jan 2017 19:21:59 +0000 (19:21 +0000)]
x11: Fix deadlock am: 5e863331b2
am: 7d0ad652ff

Change-Id: Iee8b38b57db70a18a98eda81ce47031aacd42106

7 years agox11: Call XInitThreads()
Chad Versace [Mon, 23 Jan 2017 19:15:39 +0000 (19:15 +0000)]
x11: Call XInitThreads()
am: 5d11c9d2c0

Change-Id: Ie64aa435c9f47de24df207f46a6831c2adf1e36a

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev
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

7 years agox11: Fix deadlock
Chad Versace [Mon, 23 Jan 2017 19:15:17 +0000 (19:15 +0000)]
x11: Fix deadlock
am: 5e863331b2

Change-Id: I2a59eb8b76b5106f6696d05a9e9181489399ddc3

7 years agoMerge "x11: Call XInitThreads()" into nougat-cts-dev
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

7 years agox11: Call XInitThreads()
Chad Versace [Mon, 23 Jan 2017 19:12:25 +0000 (19:12 +0000)]
x11: Call XInitThreads()
am: 5d11c9d2c0

Change-Id: Ib89f9fbfaa7d0b3dcb590fc2ac20ff2c83e3fbad

7 years agoMerge "x11: Fix deadlock" into nougat-cts-dev
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