fix merge of all-named-files-under

Change-Id: Iad4c30abdcfca1e73a2a3d525dfcea57f92c5c40
1 file changed