A nothing project containing a trivial Android project, testing merges