Chalard Jean 2c852db564
Resolve merge conflicts of 69791b6883 to master ...
Test: this is the exact code these changes were meant to give
without conflict had the auto-merger not squashed them
together before it tried to merge them. It was tested on
master in this state.
Change-Id: I5cbde17fb6016e5e6b5d0b04c8f41858d708ef4a
2018-01-24 15:59:26 +09:00
2018-01-19 15:43:53 -08:00
2017-12-13 20:05:36 -07:00
2018-01-02 21:41:29 +09:00
2018-01-24 06:24:29 +00:00
2018-01-08 11:39:22 -08:00
2018-01-18 18:19:25 +00:00
2017-12-13 20:05:36 -07:00
2018-01-24 03:00:27 +00:00
2018-01-18 01:39:10 +00:00
2018-01-23 18:10:12 -08:00
2018-01-16 16:10:53 +00:00
2018-01-24 15:59:26 +09:00
2018-01-24 05:47:30 +00:00
2017-12-13 20:05:36 -07:00
2018-01-22 18:55:01 +00:00
2018-01-24 06:09:21 +00:00
2018-01-24 01:45:08 +00:00
2018-01-23 17:49:26 -08:00
2017-12-13 20:05:36 -07:00
2018-01-23 13:57:29 +00:00
2017-12-13 20:05:36 -07:00
2018-01-24 03:10:27 +00:00
2018-01-24 04:19:20 +00:00
2018-01-22 22:13:57 +00:00
2018-01-24 06:35:28 +00:00
2c852db564