| commit | 388d08b6e3f6eab30e90ac22b151862b3b4ab352 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Aug 31 18:02:57 2016 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Aug 31 18:02:57 2016 -0700 |
| tree | 64eee9999919f2eb1ac4337d1a90d6712bba8074 | |
| parent | 0ab209c70403b74cd9e36d3e570f3929b62e4a70 [diff] | |
| parent | a2c1196dc25bfefe094c5d1757f8e2fd22500222 [diff] |
resolve merge conflicts of a2c1196 to master Change-Id: I221f03e2cda9e677199698d492d16788c25c9e96