Merge "Change default memory for Promise flavor"
authorjose.lausuch <jose.lausuch@ericsson.com>
Fri, 2 Sep 2016 07:55:10 +0000 (07:55 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 2 Sep 2016 07:55:10 +0000 (07:55 +0000)

Trivial merge