tree 3c585f18f2662243057dee633e37b88554909aae
parent 952dd7b4bc9e3056585ab0b56b829d9bf8f86f7c
author hs536 <sawamura.hiroki@fujitsu.com> 1591174181 +0900
committer hs536 <sawamura.hiroki@fujitsu.com> 1591174181 +0900

Fix merge errors with jakarta-ized sources

Signed-off-by: hs536 <sawamura.hiroki@fujitsu.com>