| commit | 309335e7278b00e4d7f5df1f311e8b0e7ea1971b | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Fri Apr 14 15:59:04 2017 +0200 |
| committer | Benoit Lamarche <benoitlamarche@google.com> | Fri Apr 14 15:59:04 2017 +0200 |
| tree | ea5ebc09847af4ed79c34f82b63c3f38e38e7d9f | |
| parent | 20041c2d0053eeaeb29ccd112e85ebc1a65b3af2 [diff] | |
| parent | 57fb5872d19cf5b3916af3070997000b2d15e584 [diff] |
resolve merge conflicts of 57fb5872d19c to master Test: I solemnly swear I tested this conflict resolution. Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8