Merge "AAF Versions 11_20" into casablanca
authorYang Xu <yang.xu3@huawei.com>
Tue, 20 Nov 2018 13:47:24 +0000 (13:47 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 20 Nov 2018 13:47:24 +0000 (13:47 +0000)

Trivial merge