commit | d61ffe53a61faa42958a43fc2c93d3ce95bd0d94 | [log] [tgz] |
---|---|---|
author | Laurent Goubet <laurent.goubet@obeo.fr> | Fri Mar 16 18:05:13 2018 +0100 |
committer | Laurent Goubet <laurent.goubet@obeo.fr> | Mon Mar 19 04:37:32 2018 -0500 |
tree | 903aa35b3f5c3ad5b19bff3c1c4d8ef44db74734 | |
parent | 8c52219110c88d80d748c843b2fb08826ac31135 [diff] |
Proxy loading from the merge tool Bug: 532484 Change-Id: I7f2e34db492c82a01d6cd42a2c0800e7a3f75455