Merge "Split Shim-layer architecture and Integrated architecture"
authorGerald Kunzmann <kunzmann@docomolab-euro.com>
Tue, 12 Jan 2016 06:40:41 +0000 (06:40 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 06:40:41 +0000 (06:40 +0000)

Trivial merge