Update patch set 2

Patch Set 2: Code-Review+2

reinstate previous +2, merely minor conflict resolution after changing the order of patches

Patch-set: 2
Label: Code-Review=+2
This commit is contained in:
Neels Hofmeyr 2017-09-06 14:28:20 +00:00 committed by Gerrit Code Review
parent 062090a957
commit 3c840f3a88

Diff Content Not Available