Merge "Switch to OOM master branch"
authorGary Wu <gary.i.wu@huawei.com>
Tue, 13 Mar 2018 18:02:30 +0000 (18:02 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 13 Mar 2018 18:02:30 +0000 (18:02 +0000)

Trivial merge