| commit | 2c852db56499f68b53fae92b075df5f47412dcf4 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Wed Jan 24 15:59:26 2018 +0900 |
| committer | Chalard Jean <jchalard@google.com> | Wed Jan 24 15:59:26 2018 +0900 |
| tree | 1cd6e3ca1cbe2fd1af3fd2864ed684c21e115d2f | |
| parent | 8b314b2b5dcbba49dae55eadced4a968beeffff7 [diff] | |
| parent | 69791b68837bf5f19654937396f7e55e2117743e [diff] |
Resolve merge conflicts of 69791b68837bf5f19654937396f7e55e2117743e 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