Code review comment for lp:~milo/linaro-ci-dashboard/android-build-config

>
> Re: other changes - it's a bit hard to review them, because it seems that diff
> is being made against older version of trunk, while tip of it already contains
> templating code, etc. Can you merge trunk into this branch and re-push it to
> get better diff?

It is actually based on trunk, the problem was that we were already working on the template part, adding the directories as needed, but conflicts raised when merging trunk (conflicts on directory, with ".moved" attached to it). I thought that using "bzr resolve" would have clean it out, but that was not the case. It marked as removed and then added back the files.