Fix printing.gyp by joining two 'conditions' dicts together.

Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61d5369a930af480c265c0c5b924888914 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
TBR=skau@chromium.org

Committed: https://crrev.com/700090668633cb92bf3705d4270920a7917204f1
Cr-Commit-Position: refs/heads/master@{#407160}

[Alexander Potapenko, 2016-07-22 14:16:23]

glider@chromium.org changed reviewers:
+ skau@chromium.org

[Alexander Potapenko, 2016-07-22 14:16:24]

TBR

[Alexander Potapenko, 2016-07-22 14:16:38]

Description was changed from

==========
Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61d5369a930af480c265c0c5b924888914 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
==========

to

==========
Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61d5369a930af480c265c0c5b924888914 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
TBR=skau@chromium.org
==========

[Alexander Potapenko, 2016-07-22 14:16:45]

The CQ bit was checked by glider@chromium.org

[commit-bot: I haz the power, 2016-07-22 14:17:03]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-22 14:55:44]

Description was changed from

==========
Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61d5369a930af480c265c0c5b924888914 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
TBR=skau@chromium.org
==========

to

==========
Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61d5369a930af480c265c0c5b924888914 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
TBR=skau@chromium.org
==========

[commit-bot: I haz the power, 2016-07-22 14:55:45]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-07-22 14:57:33]

Description was changed from

==========
Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61d5369a930af480c265c0c5b924888914 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
TBR=skau@chromium.org
==========

to

==========
Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61d5369a930af480c265c0c5b924888914 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
TBR=skau@chromium.org

Committed: https://crrev.com/700090668633cb92bf3705d4270920a7917204f1
Cr-Commit-Position: refs/heads/master@{#407160}
==========

[commit-bot: I haz the power, 2016-07-22 14:57:34]

Patchset 1 (id:??) landed as
https://crrev.com/700090668633cb92bf3705d4270920a7917204f1
Cr-Commit-Position: refs/heads/master@{#407160}

[skau, 2016-07-22 20:17:12]

lgtm