| commit | 71c510236c92c14efae6ff00e68cf9ad38f51c32 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Fri Sep 02 17:54:37 2016 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Fri Sep 02 18:04:29 2016 -0700 |
| tree | c0a720f4aa7d242388d619b0e58a4fef84787f18 | |
| parent | 1bf4ac3569f038e3c07169fc514bd2317eecf024 [diff] | |
| parent | bde1d3458f345f85e263bb3711487879e6750d86 [diff] |
resolve merge conflicts of bde1d34 to master Change-Id: Id3cef32bb97cfe8483001e71207b65bc0bc6e304