Merge "have patchoat take directories instead of filenames"
am: a92749ebae

Change-Id: I05daf4ec951c21a19647c50d6d3dc5577bd0b605