Merge "Removing CPU specification from Templates"
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Thu, 14 Jan 2016 16:27:32 +0000 (16:27 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 14 Jan 2016 16:27:32 +0000 (16:27 +0000)

Trivial merge