Changing Nexus S and Galasy S2 to use Code Aurora
Merge pull request #64 from adamkalis/v1-train

Bug 852200 - Changing Nexus S and Galasy S2 to use Code Aurora
Merge remote-tracking branch 'upstream/v1-train' into v1-train