freezing revsion attributes for the v1-train branch
Merge branch 'v1-train' into atilag-sgs2

Conflicts:
	emulator.xml
	galaxy-nexus.xml
	galaxy-s2.xml
	nexus-s-4g.xml
	nexus-s.xml
	optimus-l5.xml
	otoro.xml
	pandaboard.xml