| commit | 9a4e85dfb1a03b7fd6eb29150a66e2c80d75602d | [log] [tgz] |
|---|---|---|
| author | Vitalii Tomkiv <vitalit@google.com> | Wed Apr 06 11:17:38 2016 -0700 |
| committer | Vitalii Tomkiv <vitalit@google.com> | Wed Apr 06 11:17:38 2016 -0700 |
| tree | ac213096d64fe3649fb55de8b163ddcac6d9f1ad | |
| parent | 9860c960355379c90e25428c9f51cd2130ae2824 [diff] | |
| parent | 8082894f511b1c25b4a3d545760c569a966549dc [diff] |
resolve merge conflicts of 8082894 to master Change-Id: Ie09f0c071d3ebb2079cd5fd0630d02495d20659b