Merge "init attribute-based encription"
authorRuan HE <ruan.he@orange.com>
Fri, 4 Sep 2015 07:35:22 +0000 (07:35 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 4 Sep 2015 07:35:22 +0000 (07:35 +0000)

Trivial merge