summaryrefslogtreecommitdiff
path: root/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
AgeCommit message (Collapse)Author
2015-12-15Migrate to IntelliJ format, also contains some minor logging changes and ↵HEADmasterJoe Robinson
moved libraries