Commit ffe624df authored by Tor Norbye's avatar Tor Norbye
Browse files

82393: Fix template instantiation in ADT 

First, implement a couple of new freemarker methods required by the
templates. Second, switch the manifest merger over to the new
Manifest merger.

Change-Id: I26200d0a861ebddd4c4c92ebbba418ccb88fcb20
(cherry picked from commit d7d481fa)
parent d3f8c812
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment