Merge "Add support for subfolders in assets folders."
Xavier Ducrohet [Fri, 15 Mar 2013 01:35:06 +0000 (01:35 +0000)]

Trivial merge