platform/upstream/VK-GL-CTS.git
7 years agoAdd new tessellation negative coverage tests am: 1889817926 am: 6505a995c1 am: 02e452454c
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

7 years agoAdd new tessellation negative coverage tests am: 1889817926 am: 6505a995c1
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

7 years agoAdd new tessellation negative coverage tests am: 1889817926
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

7 years agoAdd new tessellation negative coverage tests
John Richardson [Mon, 30 Jan 2017 20:43:44 +0000 (20:43 +0000)]
Add new tessellation negative coverage tests
am: 1889817926

Change-Id: I8f4b76d0c37c88c45512352502ed138acc095fc4

7 years agoAdd new tessellation negative coverage tests
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

7 years agoMerge nougat-mr1-cts-dev into master. am: 2dcacdbe0a am: b196334de5 am: 769492af1d
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

7 years agoMerge nougat-mr1-cts-dev into master. am: 2dcacdbe0a am: b196334de5
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

7 years agoMerge nougat-mr1-cts-dev into master. am: 2dcacdbe0a
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

7 years agoMerge nougat-mr1-cts-dev into master.
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

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master. am: b1fa5e8f2c...
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

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
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

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master. am: b1fa5e8f2c...
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

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
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

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master. am: b1fa5e8f2c
Xin Li [Thu, 26 Jan 2017 20:37:32 +0000 (20:37 +0000)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on  am: b1fa5e8f2c
am: ef0c4176d6

Change-Id: I722cc549948cf2de67e6f73e9567c1fd60b81dd3

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
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

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master.
Xin Li [Thu, 26 Jan 2017 20:34:33 +0000 (20:34 +0000)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on 
am: b1fa5e8f2c

Change-Id: If4100aebe657cc11438526fc0d0151d4158e2372

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...
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

7 years agoMerge nougat-mr1-cts-dev into master.
Xin Li [Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)]
Merge nougat-mr1-cts-dev into master.

7 years agoSkip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master.
Xin Li [Thu, 26 Jan 2017 18:53:54 +0000 (10:53 -0800)]
Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on 

7 years agoMerge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
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

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float am: 54c090f981 am: 225e1e1eb7...
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

7 years agoAdd basic test for EGL_KHR_no_config_context am: d7ec39dd04 am: a05826c329 am: 726be5f657
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

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float am: 54c090f981 am: 225e1e1eb7
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

7 years agoAdd basic test for EGL_KHR_no_config_context am: d7ec39dd04 am: a05826c329
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

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float am: 54c090f981
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

7 years agoAdd basic test for EGL_KHR_no_config_context am: d7ec39dd04
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

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float
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

7 years agoAdd basic test for EGL_KHR_no_config_context
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

7 years agoAdd eglChooseConfig() tests for EXT_pixel_format_float
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

7 years agoAdd basic test for EGL_KHR_no_config_context
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

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395...
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

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395
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

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f
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

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
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

7 years agoMerge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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