| commit | 934540abc5d612b46c43c9682fbf0cb734aac04a | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Jan 20 19:51:02 2016 -0800 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Jan 20 19:51:02 2016 -0800 |
| tree | 84f92962a1030a925f47600f4e2519695f4d1b67 | |
| parent | 26cd7feb42bff178abf2ab6cc0a1d973a5ddb5fd [diff] | |
| parent | 29eedacee05a74ebbcf87ea465cbc9e3c61beb15 [diff] |
resolve merge conflicts of 29eedacee0 to master. Change-Id: I325541269f5a0f7c1fde7a57042543e769bed218