Merge "Change default memory for Promise flavor" into stable/colorado
authorjose.lausuch <jose.lausuch@ericsson.com>
Tue, 6 Sep 2016 12:40:07 +0000 (12:40 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 6 Sep 2016 12:40:07 +0000 (12:40 +0000)

Trivial merge