| commit | 24c27754c5f1d23dfa679ade368977936519a58d | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Aug 31 18:09:00 2016 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Aug 31 18:09:00 2016 -0700 |
| tree | 83673d0c8ee4cf172ada6af5d68a2c47a0417c79 | |
| parent | 388d08b6e3f6eab30e90ac22b151862b3b4ab352 [diff] |
resolve merge conflicts of a2c1196 to master - continued Change-Id: I1b3c0e1a42b4cbb025de049e95d5377a162d58d1